From 84f6ce1bf15c6632f32a1402b0cceccc13049995 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Wed, 27 Sep 2023 10:58:55 -0700
Subject: [PATCH 01/18] Added tests

---
 .../BranchActivityItemTests.m                 |  45 +++
 .../Branch-SDK-Tests/BranchClassTests.m       | 282 ++++++++++++++++++
 .../Branch-SDK-Tests/BranchEvent.Test.m       |  24 ++
 .../BranchSetIdentityRequestTests.m           |   5 +-
 .../BranchUniversalObject.Test.m              |  28 ++
 .../Branch_setBranchKeyTests.m                |  34 +++
 .../Branch-TestBed.xcodeproj/project.pbxproj  |   8 +
 BranchSDK/BranchActivityItemProvider.m        |   1 -
 8 files changed, 423 insertions(+), 4 deletions(-)
 create mode 100644 Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
 create mode 100644 Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
new file mode 100644
index 000000000..db47368c8
--- /dev/null
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
@@ -0,0 +1,45 @@
+//
+//  BranchActivityItemTests.m
+//  Branch-SDK-Tests
+//
+//  Created by Nipun Singh on 9/21/23.
+//  Copyright © 2023 Branch, Inc. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "Branch.h"
+
+@interface BranchActivityItemTests: XCTestCase
+@end
+
+@implementation BranchActivityItemTests
+
+- (void)setUp {
+    [super setUp];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testGetBranchActivityItemWithAllParams {
+    NSDictionary *params = @{@"key": @"value"};
+    NSString *feature = @"feature4";
+    NSString *stage = @"stage3";
+    NSArray *tags = @[@"tag3", @"tag4"];
+    NSString *campaign = @"campaign1";
+    NSString *alias = @"alias1";
+    BranchActivityItemProvider *provider = [Branch getBranchActivityItemWithParams:params feature:feature stage:stage campaign:campaign tags:tags alias:alias];
+    if ([[provider item] isKindOfClass:[NSURL class]]) {
+        NSURL *urlObject = (NSURL *)[provider item];
+        NSString *url = [urlObject absoluteString];
+        
+        NSLog(@"Provider URL as String: %@", url);
+        
+        XCTAssertTrue([url isEqualToString:@"https://bnctestbed.app.link/alias1"]);
+    } else {
+        XCTFail("Provider Data is not of type NSURL");
+    }
+}
+
+@end
diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
new file mode 100644
index 000000000..1beae85b3
--- /dev/null
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -0,0 +1,282 @@
+//
+//  BranchClassTests.m
+//  Branch-SDK-Tests
+//
+//  Created by Nipun Singh on 9/25/23.
+//  Copyright © 2023 Branch, Inc. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "Branch.h"
+#import "BranchConstants.h"
+#import "BNCPasteboard.h"
+#import "BNCAppGroupsData.h"
+#import "BNCPartnerParameters.h"
+
+@interface BranchClassTests : XCTestCase
+@property (nonatomic, strong) Branch *branch;
+@end
+
+@implementation BranchClassTests
+
+- (void)setUp {
+    [super setUp];
+    self.branch = [Branch getInstance];
+}
+
+- (void)tearDown {
+    self.branch = nil;
+    [super tearDown];
+}
+
+- (void)testResetUserSession {
+    [self.branch resetUserSession];
+    //XCTAssertEqual([BNCPreferenceHelper sharedInstance]., BNCInitStatusUninitialized, @"Initialization status should be BNCInitStatusUninitialized");
+}
+
+- (void)testIsUserIdentified {
+    [self.branch setIdentity: @"userId"];
+    XCTAssertTrue([self.branch isUserIdentified], @"User should be identified");
+}
+
+- (void)testDisableAdNetworkCallouts {
+    [self.branch disableAdNetworkCallouts:YES];
+    XCTAssertTrue([BNCPreferenceHelper sharedInstance].disableAdNetworkCallouts, @"AdNetwork callouts should be disabled");
+}
+
+- (void)testSetNetworkTimeout {
+    [self.branch setNetworkTimeout:5.0];
+    XCTAssertEqual([BNCPreferenceHelper sharedInstance].timeout, 5.0, @"Network timeout should be set to 5.0");
+}
+
+- (void)testSetMaxRetries {
+    [self.branch setMaxRetries:3];
+    XCTAssertEqual([BNCPreferenceHelper sharedInstance].retryCount, 3, @"Max retries should be set to 3");
+}
+
+- (void)testSetRetryInterval {
+    [self.branch setRetryInterval:2.0];
+    XCTAssertEqual([BNCPreferenceHelper sharedInstance].retryInterval, 2.0, @"Retry interval should be set to 2.0");
+}
+
+- (void)testSetRequestMetadataKeyAndValue {
+    [self.branch setRequestMetadataKey:@"key" value:@"value"];
+    NSDictionary *metadata = [BNCPreferenceHelper sharedInstance].requestMetadataDictionary;
+    XCTAssertEqualObjects(metadata[@"key"], @"value");
+}
+
+- (void)testSetTrackingDisabled {
+    // Initial state
+    XCTAssertFalse([BNCPreferenceHelper sharedInstance].trackingDisabled);
+
+    // Set tracking to disabled
+    [Branch setTrackingDisabled:YES];
+    XCTAssertTrue([BNCPreferenceHelper sharedInstance].trackingDisabled);
+
+    // Revert tracking to enabled
+    [Branch setTrackingDisabled:NO];
+    XCTAssertFalse([BNCPreferenceHelper sharedInstance].trackingDisabled);
+}
+
+//- (void)testSetReferrerGbraidValidityWindow {
+//    // Initial state, should be nil or non-existing
+//    XCTAssertNil([BNCPreferenceHelper sharedInstance].referringURLQueryParameters[BRANCH_REQUEST_KEY_REFERRER_GBRAID][BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY]);
+//
+//    // Set validity window
+//    NSTimeInterval validityWindow = 1592000.0;
+//    [Branch setReferrerGbraidValidityWindow:validityWindow];
+//    [NSThread sleepForTimeInterval:1.0];
+//    NSLog(@"After setting 2: %@", [BNCPreferenceHelper sharedInstance].referringURLQueryParameters);
+//
+//    // Check if it's set correctly
+//    XCTAssertEqual([BNCPreferenceHelper sharedInstance].referrerGBRAIDValidityWindow, validityWindow);
+//}
+
+- (void)testCheckPasteboardOnInstall {
+    [self.branch checkPasteboardOnInstall];
+    BOOL checkOnInstall = [BNCPasteboard sharedInstance].checkOnInstall;
+    XCTAssertTrue(checkOnInstall);
+}
+
+- (void)testWillShowPasteboardToast_ShouldReturnYes {
+    [BNCPreferenceHelper sharedInstance].randomizedBundleToken = nil;
+    [BNCPasteboard sharedInstance].checkOnInstall = YES;
+    UIPasteboard.generalPasteboard.URL = [NSURL URLWithString:@"https://example.com"];
+
+    BOOL result = [self.branch willShowPasteboardToast];
+    XCTAssertTrue(result);
+}
+
+- (void)testWillShowPasteboardToast_ShouldReturnNo {
+    [BNCPreferenceHelper sharedInstance].randomizedBundleToken = @"some_token";
+    [BNCPasteboard sharedInstance].checkOnInstall = NO;
+
+    BOOL result = [self.branch willShowPasteboardToast];
+    XCTAssertFalse(result);
+}
+
+- (void)testSetAppClipAppGroup {
+    NSString *testAppGroup = @"testAppGroup";
+    [self.branch setAppClipAppGroup:testAppGroup];
+    NSString *actualAppGroup = [BNCAppGroupsData shared].appGroup;
+
+    XCTAssertEqualObjects(testAppGroup, actualAppGroup);
+}
+
+- (void)testClearPartnerParameters {
+    [self.branch addFacebookPartnerParameterWithName:@"ph" value:@"123456789"];
+    [[BNCPartnerParameters shared] clearAllParameters];
+       
+    NSDictionary *result = [[BNCPartnerParameters shared] parameterJson];
+    XCTAssertEqual([result count], 0, @"Parameters should be empty after calling clearAllParameters");
+}
+
+- (void)testAddFacebookParameterWithName_Value {
+    [self.branch addFacebookPartnerParameterWithName:@"name" value:@"3D4F2BF07DC1BE38B20C653EE9A7E446158F84E525BBB98FEDF721CB5A40A346"];
+    
+    NSDictionary *result = [[BNCPartnerParameters shared] parameterJson][@"fb"];
+    XCTAssertEqualObjects(result[@"name"], @"3D4F2BF07DC1BE38B20C653EE9A7E446158F84E525BBB98FEDF721CB5A40A346", @"Should add parameter for Facebook");
+}
+
+- (void)testAddSnapParameterWithName_Value {
+    [self.branch addSnapPartnerParameterWithName:@"name" value:@"3D4F2BF07DC1BE38B20C653EE9A7E446158F84E525BBB98FEDF721CB5A40A346"];
+    
+    NSDictionary *result = [[BNCPartnerParameters shared] parameterJson][@"snap"];
+    XCTAssertEqualObjects(result[@"name"], @"3D4F2BF07DC1BE38B20C653EE9A7E446158F84E525BBB98FEDF721CB5A40A346", @"Should add parameter for Snap");
+}
+
+- (void)testGetFirstReferringBranchUniversalObject_ClickedBranchLink {
+    NSString *installParamsString = @"{\"$canonical_identifier\":\"content/12345\",\"$creation_timestamp\":1694557342247,\"$desktop_url\":\"https://example.com/home\",\"$og_description\":\"My Content Description\",\"$og_title\":\"My Content Title\",\"+click_timestamp\":1695749249,\"+clicked_branch_link\":1,\"+is_first_session\":1,\"+match_guaranteed\":1,\"custom\":\"data\",\"key1\":\"value1\",\"~campaign\":\"content 123 launch\",\"~channel\":\"facebook\",\"~creation_source\":3,\"~feature\":\"sharing\",\"~id\":1230269548213984984,\"~referring_link\":\"https://bnctestbed.app.link/uSPHktjO2Cb\"}";
+    [[BNCPreferenceHelper sharedInstance] setInstallParams: installParamsString];
+
+    BranchUniversalObject *result = [self.branch getFirstReferringBranchUniversalObject];\
+    XCTAssertNotNil(result);
+    XCTAssertEqualObjects(result.title, @"My Content Title");
+    XCTAssertEqualObjects(result.canonicalIdentifier, @"content/12345");
+}
+
+- (void)testGetFirstReferringBranchUniversalObject_NotClickedBranchLink {
+    NSString *installParamsString = @"{\"+clicked_branch_link\":false,\"+is_first_session\":true}";
+    [[BNCPreferenceHelper sharedInstance] setInstallParams: installParamsString];
+        
+    BranchUniversalObject *result = [self.branch getFirstReferringBranchUniversalObject];
+    XCTAssertNil(result);
+}
+
+- (void)testGetFirstReferringBranchLinkProperties_ClickedBranchLink {
+    NSString *installParamsString = @"{\"+clicked_branch_link\":1,\"+is_first_session\":1,\"~campaign\":\"content 123 launch\"}";
+    [[BNCPreferenceHelper sharedInstance] setInstallParams:installParamsString];
+
+    BranchLinkProperties *result = [self.branch getFirstReferringBranchLinkProperties];
+    XCTAssertNotNil(result);
+    XCTAssertEqualObjects(result.campaign, @"content 123 launch");
+}
+
+- (void)testGetFirstReferringBranchLinkProperties_NotClickedBranchLink {
+    NSString *installParamsString = @"{\"+clicked_branch_link\":false,\"+is_first_session\":true}";
+    [[BNCPreferenceHelper sharedInstance] setInstallParams:installParamsString];
+
+    BranchLinkProperties *result = [self.branch getFirstReferringBranchLinkProperties];
+    XCTAssertNil(result);
+}
+
+- (void)testGetFirstReferringParams {
+    NSString *installParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":true}";
+    [[BNCPreferenceHelper sharedInstance] setInstallParams:installParamsString];
+
+    NSDictionary *result = [self.branch getFirstReferringParams];
+    XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
+}
+
+- (void)testGetLatestReferringParams {
+    NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
+    // Assume setSessionParams: exists or use a method to mock sessionParams
+    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
+
+    NSDictionary *result = [self.branch getLatestReferringParams];
+    XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
+}
+
+- (void)testGetLatestReferringParamsSynchronous {
+    NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
+    // Assume setSessionParams: exists or use a method to mock sessionParams
+    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
+
+    NSDictionary *result = [self.branch getLatestReferringParamsSynchronous];
+    XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
+}
+
+- (void)testGetLatestReferringBranchUniversalObject_ClickedBranchLink {
+    NSString *sessionParamsString = @"{\"+clicked_branch_link\":1,\"+is_first_session\":false,\"$og_title\":\"My Latest Content\"}";
+    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
+
+    BranchUniversalObject *result = [self.branch getLatestReferringBranchUniversalObject];
+    XCTAssertNotNil(result);
+    XCTAssertEqualObjects(result.title, @"My Latest Content");
+}
+
+- (void)testGetLatestReferringBranchLinkProperties_ClickedBranchLink {
+    NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false,\"~campaign\":\"latest campaign\"}";
+    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
+
+    BranchLinkProperties *result = [self.branch getLatestReferringBranchLinkProperties];
+    XCTAssertNotNil(result);
+    XCTAssertEqualObjects(result.campaign, @"latest campaign");
+}
+
+- (void)testGetShortURL {
+   XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
+      
+   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+       NSString *shortURL = [self.branch getShortURL];
+       
+       XCTAssertNotNil(shortURL, @"URL should not be nil");
+       XCTAssertTrue([shortURL hasPrefix:@"https://"], @"URL should start with 'https://'");
+       
+       [expectation fulfill];
+   });
+
+   [self waitForExpectationsWithTimeout:10 handler:^(NSError *error) {
+       if (error) {
+           NSLog(@"Timeout Error: %@", error);
+       }
+   }];
+}
+
+- (void)testGetShortURLWithParams {
+   XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
+   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+       NSDictionary *params = @{@"key": @"value"};
+       NSArray *tags = @[@"tag1", @"tag2"];
+       NSString *randomAlias = [[NSUUID UUID] UUIDString];
+       [self.branch getShortUrlWithParams:params andTags:tags andAlias:randomAlias andMatchDuration:10 andChannel:@"channel1" andFeature:@"feature1" andStage:@"stage1" andCampaign:@"campaign1" andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
+           
+           NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
+           XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
+
+           [expectation fulfill];
+       }];
+   });
+
+   [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
+       if (error) {
+           NSLog(@"Timeout Error: %@", error);
+       }
+   }];
+}
+
+- (void)testGetLongURLWithParamsAndChannelAndTagsAndFeatureAndStageAndAlias {
+    NSDictionary *params = @{@"key": @"value"};
+    NSString *channel = @"channel1";
+    NSArray *tags = @[@"tag1", @"tag2"];
+    NSString *feature = @"feature1";
+    NSString *stage = @"stage1";
+    NSString *alias = @"alias1";
+    
+    NSString *generatedURL = [self.branch getLongURLWithParams:params andChannel:channel andTags:tags andFeature:feature andStage:stage andAlias:alias];
+    NSString *expectedURL = @"https://bnctestbed.app.link?key=value&channel=channel1&tags=tag1,tag2&feature=feature1&stage=stage1&alias=alias1";
+    
+    XCTAssertEqualObjects(generatedURL, expectedURL, @"URL should match the expected format");
+}
+
+@end
diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchEvent.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchEvent.Test.m
index 7ea82607b..bcee76f73 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchEvent.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchEvent.Test.m
@@ -11,6 +11,7 @@
 #import "BranchConstants.h"
 #import "BranchEvent.h"
 #import "BNCDeviceInfo.h"
+#import "NSError+Branch.h"
 
 @interface Branch (BranchEventTest)
 - (void) processNextQueueItem;
@@ -662,4 +663,27 @@ - (void)testJsonStringForAdTypeNative {
     XCTAssertTrue([[event jsonStringForAdType:BranchEventAdTypeNative] isEqualToString:@"NATIVE"]);
 }
 
+- (void) testCustomEventWithContentItem {
+    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"buoTitle"];
+    BranchEvent *event = [BranchEvent customEventWithName:@"testEvent" contentItem:buo];
+    
+    XCTAssertTrue(event.contentItems.count == 1);
+    XCTAssertTrue([event.contentItems.firstObject.title isEqualToString:@"buoTitle"]);
+}
+
+- (void)testLogEventWithCompletion_InvalidEventName {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Logging Event"];
+    BranchEvent *event = [BranchEvent customEventWithName:@""];
+
+    [event logEventWithCompletion:^(BOOL success, NSError * _Nullable error) {
+        XCTAssertFalse(success, @"Success should be NO for invalid event name");
+        XCTAssertNotNil(error, @"Error should not be nil for invalid event name");
+        XCTAssertEqual(error.code, BNCGeneralError, @"Error code should match expected value for invalid event name");
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:5 handler:nil];
+}
+
+
 @end
diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchSetIdentityRequestTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchSetIdentityRequestTests.m
index c6b156661..9b404bf8b 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchSetIdentityRequestTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchSetIdentityRequestTests.m
@@ -50,8 +50,6 @@ - (void)testSetIdentityWithNilUserId {
         
         [self waitForExpectationsWithTimeout:5 handler:nil];
     }];
-    
-
 }
 
 - (void)testSetIdentityWithUserId {
@@ -64,7 +62,8 @@ - (void)testSetIdentityWithUserId {
 
         XCTAssertEqualObjects(@"testUserId", preferenceHelper.userIdentity);
     }];
-
 }
 
+
+
 @end
diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
index 97c90755f..c11950f87 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
@@ -278,4 +278,32 @@ - (void) testRegisterView {
     [self waitForExpectationsWithTimeout:2.0 handler:nil];
 }
 
+- (void) testInitWithTitle {
+    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"buoTitle"];
+    XCTAssertEqual(buo.title, @"buoTitle");
+}
+
+- (void)testGetShortURLWithParams {
+    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"buoTitle"];
+    BranchLinkProperties *lp = [BranchLinkProperties new];
+    NSString *randomAlias = [[NSUUID UUID] UUIDString];
+    lp.alias = randomAlias;
+    
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
+            NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
+            XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
+            [expectation fulfill];
+        }];
+    });
+
+    [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
+        if (error) {
+            NSLog(@"Timeout Error: %@", error);
+        }
+    }];
+}
+
 @end
diff --git a/Branch-TestBed/Branch-SDK-Unhosted-Tests/Branch_setBranchKeyTests.m b/Branch-TestBed/Branch-SDK-Unhosted-Tests/Branch_setBranchKeyTests.m
index 7cc15272f..3792b3933 100644
--- a/Branch-TestBed/Branch-SDK-Unhosted-Tests/Branch_setBranchKeyTests.m
+++ b/Branch-TestBed/Branch-SDK-Unhosted-Tests/Branch_setBranchKeyTests.m
@@ -8,6 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "Branch.h"
+#import "NSError+Branch.h"
 
 // expose private methods used by tests
 @interface Branch()
@@ -96,4 +97,37 @@ - (void)testSetBranchKeyWithError_validKeyTwice {
     XCTAssert([[Branch branchKey] isEqualToString:testKey]);
 }
 
+- (void)testResetBranchKey {
+    NSString *testKey = @"key_live_foo";
+    [Branch setBranchKey:testKey];
+    
+    XCTAssert([[Branch branchKey] isEqualToString:testKey]);
+
+    [Branch resetBranchKey];
+    XCTAssertNil([Branch branchKey], @"Branch key should be reset to nil");
+}
+
+- (void)testSetBranchKey_Error_InvalidKeyType {
+    NSError *error = nil;
+    NSNumber *invalidKey = @123;
+
+    [Branch setBranchKey:(NSString *)invalidKey error:&error];
+    XCTAssertNotNil(error);
+    XCTAssertEqual(error.code, BNCInitError);
+    XCTAssertEqualObjects(error.localizedFailureReason, @"Invalid Branch key of type '__NSCFNumber'.");
+}
+
+- (void)testSetBranchKey_Error_InvalidKeyFormat {
+    NSError *error = nil;
+    NSString *invalidFormatKey = @"invalid_format";
+
+    [Branch setBranchKey:invalidFormatKey error:&error];
+    XCTAssertNotNil(error);
+    XCTAssertEqual(error.code, BNCInitError);
+    XCTAssertEqualObjects(error.localizedFailureReason, @"Invalid Branch key format. Did you add your Branch key to your Info.plist? Passed key is 'invalid_format'.");
+}
+
+
+
+
 @end
diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj
index d1e171596..23aae0a8f 100644
--- a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj
+++ b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj
@@ -248,6 +248,7 @@
 		C12320B52808DB90007771C0 /* BranchQRCodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C12320B42808DB90007771C0 /* BranchQRCodeTests.m */; };
 		C12320B7280E2060007771C0 /* BranchQRCode.h in Headers */ = {isa = PBXBuildFile; fileRef = C12320B6280E2060007771C0 /* BranchQRCode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C12320B9280E2091007771C0 /* BranchQRCode.m in Sources */ = {isa = PBXBuildFile; fileRef = C12320B8280E2091007771C0 /* BranchQRCode.m */; };
+		C15CC9E02ABCF8C8003CC339 /* BranchActivityItemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C15CC9DF2ABCF8C8003CC339 /* BranchActivityItemTests.m */; };
 		C1614D56285BC8A00098946B /* LinkPresentation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1614D55285BC8A00098946B /* LinkPresentation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		C1614D5C285BD4AF0098946B /* BranchPluginSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C1614D5A285BD4AF0098946B /* BranchPluginSupport.h */; };
 		C1614D5D285BD4AF0098946B /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C1614D5B285BD4AF0098946B /* BranchPluginSupport.m */; };
@@ -255,6 +256,7 @@
 		C17394612A8C20FD006068F2 /* BNCProductCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = C173945E2A8AEDFB006068F2 /* BNCProductCategory.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C17394642A8C228D006068F2 /* BNCCurrency.m in Sources */ = {isa = PBXBuildFile; fileRef = C17394632A8C228D006068F2 /* BNCCurrency.m */; };
 		C17394652A8C23D1006068F2 /* BNCCurrency.h in Headers */ = {isa = PBXBuildFile; fileRef = C17394622A8C2282006068F2 /* BNCCurrency.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C17DAF7B2AC20C2000B16B1A /* BranchClassTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C17DAF7A2AC20C2000B16B1A /* BranchClassTests.m */; };
 		C1CC887F29BAA06600BDD2B5 /* BNCReferringURLUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = C1CC887D29BAA06600BDD2B5 /* BNCReferringURLUtility.h */; };
 		C1CC888029BAA06600BDD2B5 /* BNCReferringURLUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = C1CC887E29BAA06600BDD2B5 /* BNCReferringURLUtility.m */; };
 		C1CC888229BAAFC000BDD2B5 /* BNCReferringURLUtilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C1CC888129BAAFC000BDD2B5 /* BNCReferringURLUtilityTests.m */; };
@@ -581,6 +583,7 @@
 		C12320B42808DB90007771C0 /* BranchQRCodeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchQRCodeTests.m; sourceTree = "<group>"; };
 		C12320B6280E2060007771C0 /* BranchQRCode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BranchQRCode.h; sourceTree = "<group>"; };
 		C12320B8280E2091007771C0 /* BranchQRCode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchQRCode.m; sourceTree = "<group>"; };
+		C15CC9DF2ABCF8C8003CC339 /* BranchActivityItemTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchActivityItemTests.m; sourceTree = "<group>"; };
 		C1614D55285BC8A00098946B /* LinkPresentation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LinkPresentation.framework; path = System/Library/Frameworks/LinkPresentation.framework; sourceTree = SDKROOT; };
 		C1614D5A285BD4AF0098946B /* BranchPluginSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchPluginSupport.h; sourceTree = "<group>"; };
 		C1614D5B285BD4AF0098946B /* BranchPluginSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchPluginSupport.m; sourceTree = "<group>"; };
@@ -588,6 +591,7 @@
 		C173945F2A8AEE0E006068F2 /* BNCProductCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCProductCategory.m; sourceTree = "<group>"; };
 		C17394622A8C2282006068F2 /* BNCCurrency.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCCurrency.h; sourceTree = "<group>"; };
 		C17394632A8C228D006068F2 /* BNCCurrency.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCCurrency.m; sourceTree = "<group>"; };
+		C17DAF7A2AC20C2000B16B1A /* BranchClassTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchClassTests.m; sourceTree = "<group>"; };
 		C1CC887D29BAA06600BDD2B5 /* BNCReferringURLUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCReferringURLUtility.h; sourceTree = "<group>"; };
 		C1CC887E29BAA06600BDD2B5 /* BNCReferringURLUtility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCReferringURLUtility.m; sourceTree = "<group>"; };
 		C1CC888129BAAFC000BDD2B5 /* BNCReferringURLUtilityTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCReferringURLUtilityTests.m; sourceTree = "<group>"; };
@@ -732,6 +736,8 @@
 				5F892EC4236116CC0023AEC1 /* NSErrorBranchCategoryTests.m */,
 				4D16839E2098C901008819E3 /* NSString+Branch.Test.m */,
 				E7A728BC2AA9A112009343B7 /* BNCAPIServerTest.m */,
+				C15CC9DF2ABCF8C8003CC339 /* BranchActivityItemTests.m */,
+				C17DAF7A2AC20C2000B16B1A /* BranchClassTests.m */,
 			);
 			path = "Branch-SDK-Tests";
 			sourceTree = "<group>";
@@ -1531,7 +1537,9 @@
 				4D1683AE2098C902008819E3 /* BNCLinkDataTests.m in Sources */,
 				4D1683BD2098C902008819E3 /* BranchNetworkScenario.Test.m in Sources */,
 				4D7881FF209CF2D4002B750F /* BNCApplication+BNCTest.m in Sources */,
+				C15CC9E02ABCF8C8003CC339 /* BranchActivityItemTests.m in Sources */,
 				5F92B23423835FEB00CA909B /* BNCReachabilityTests.m in Sources */,
+				C17DAF7B2AC20C2000B16B1A /* BranchClassTests.m in Sources */,
 				C12320B52808DB90007771C0 /* BranchQRCodeTests.m in Sources */,
 				5F3D671B233062FD00454FF1 /* BNCJsonLoader.m in Sources */,
 				4D1683C02098C902008819E3 /* BranchUniversalObject.Test.m in Sources */,
diff --git a/BranchSDK/BranchActivityItemProvider.m b/BranchSDK/BranchActivityItemProvider.m
index 0f45d7e38..ba75e76de 100644
--- a/BranchSDK/BranchActivityItemProvider.m
+++ b/BranchSDK/BranchActivityItemProvider.m
@@ -98,7 +98,6 @@ - (BOOL) returnURL {
 - (id)item {
     NSString *channel = [BranchActivityItemProvider humanReadableChannelWithActivityType:self.activityType];
 
-
     // Allow for overrides specific to channel
     NSDictionary *params = [self paramsForChannel:channel];
     NSArray *tags = [self tagsForChannel:channel];

From 5279fc267ccb309d84b2c75672b20fef67908393 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Wed, 27 Sep 2023 13:39:51 -0700
Subject: [PATCH 02/18] Updated classes

---
 .../Branch-SDK-Tests/BranchClassTests.m       | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index 1beae85b3..19cf3034c 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -29,11 +29,6 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (void)testResetUserSession {
-    [self.branch resetUserSession];
-    //XCTAssertEqual([BNCPreferenceHelper sharedInstance]., BNCInitStatusUninitialized, @"Initialization status should be BNCInitStatusUninitialized");
-}
-
 - (void)testIsUserIdentified {
     [self.branch setIdentity: @"userId"];
     XCTAssertTrue([self.branch isUserIdentified], @"User should be identified");
@@ -66,32 +61,15 @@ - (void)testSetRequestMetadataKeyAndValue {
 }
 
 - (void)testSetTrackingDisabled {
-    // Initial state
     XCTAssertFalse([BNCPreferenceHelper sharedInstance].trackingDisabled);
 
-    // Set tracking to disabled
     [Branch setTrackingDisabled:YES];
     XCTAssertTrue([BNCPreferenceHelper sharedInstance].trackingDisabled);
 
-    // Revert tracking to enabled
     [Branch setTrackingDisabled:NO];
     XCTAssertFalse([BNCPreferenceHelper sharedInstance].trackingDisabled);
 }
 
-//- (void)testSetReferrerGbraidValidityWindow {
-//    // Initial state, should be nil or non-existing
-//    XCTAssertNil([BNCPreferenceHelper sharedInstance].referringURLQueryParameters[BRANCH_REQUEST_KEY_REFERRER_GBRAID][BRANCH_URL_QUERY_PARAMETERS_VALIDITY_WINDOW_KEY]);
-//
-//    // Set validity window
-//    NSTimeInterval validityWindow = 1592000.0;
-//    [Branch setReferrerGbraidValidityWindow:validityWindow];
-//    [NSThread sleepForTimeInterval:1.0];
-//    NSLog(@"After setting 2: %@", [BNCPreferenceHelper sharedInstance].referringURLQueryParameters);
-//
-//    // Check if it's set correctly
-//    XCTAssertEqual([BNCPreferenceHelper sharedInstance].referrerGBRAIDValidityWindow, validityWindow);
-//}
-
 - (void)testCheckPasteboardOnInstall {
     [self.branch checkPasteboardOnInstall];
     BOOL checkOnInstall = [BNCPasteboard sharedInstance].checkOnInstall;

From 05237c043bdaabe8e9ddf5461763dc32d38d8418 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Wed, 27 Sep 2023 13:41:34 -0700
Subject: [PATCH 03/18] Update BranchClassTests.m

---
 Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index 19cf3034c..e2728af7f 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -168,7 +168,6 @@ - (void)testGetFirstReferringParams {
 
 - (void)testGetLatestReferringParams {
     NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
-    // Assume setSessionParams: exists or use a method to mock sessionParams
     [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
 
     NSDictionary *result = [self.branch getLatestReferringParams];
@@ -177,7 +176,6 @@ - (void)testGetLatestReferringParams {
 
 - (void)testGetLatestReferringParamsSynchronous {
     NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
-    // Assume setSessionParams: exists or use a method to mock sessionParams
     [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
 
     NSDictionary *result = [self.branch getLatestReferringParamsSynchronous];

From e89c4c8b526b85993b9e8ac90f52537ae3a9bbc0 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Wed, 11 Oct 2023 14:34:33 -0700
Subject: [PATCH 04/18] Update BranchActivityItemTests.m

---
 .../Branch-SDK-Tests/BranchActivityItemTests.m      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
index db47368c8..aa33cec6b 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
@@ -14,29 +14,22 @@ @interface BranchActivityItemTests: XCTestCase
 
 @implementation BranchActivityItemTests
 
-- (void)setUp {
-    [super setUp];
-}
-
-- (void)tearDown {
-    [super tearDown];
-}
-
 - (void)testGetBranchActivityItemWithAllParams {
     NSDictionary *params = @{@"key": @"value"};
     NSString *feature = @"feature4";
     NSString *stage = @"stage3";
     NSArray *tags = @[@"tag3", @"tag4"];
     NSString *campaign = @"campaign1";
-    NSString *alias = @"alias1";
+    NSString *alias = [[NSUUID UUID] UUIDString];
     BranchActivityItemProvider *provider = [Branch getBranchActivityItemWithParams:params feature:feature stage:stage campaign:campaign tags:tags alias:alias];
+    sleep(2000);
     if ([[provider item] isKindOfClass:[NSURL class]]) {
         NSURL *urlObject = (NSURL *)[provider item];
         NSString *url = [urlObject absoluteString];
         
         NSLog(@"Provider URL as String: %@", url);
         
-        XCTAssertTrue([url isEqualToString:@"https://bnctestbed.app.link/alias1"]);
+        XCTAssertTrue([url isEqualToString:[@"https://bnctestbed.app.link/" stringByAppendingString:alias]]);
     } else {
         XCTFail("Provider Data is not of type NSURL");
     }

From 2b1d82f7ad369992b3c2c03029fba1d5833eae87 Mon Sep 17 00:00:00 2001
From: echo <echo@branch.io>
Date: Tue, 17 Oct 2023 18:57:15 -0700
Subject: [PATCH 05/18] Comment out a test to confirm it's the problem

---
 .../BranchActivityItemTests.m                 | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
index aa33cec6b..f117859f7 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchActivityItemTests.m
@@ -14,25 +14,26 @@ @interface BranchActivityItemTests: XCTestCase
 
 @implementation BranchActivityItemTests
 
-- (void)testGetBranchActivityItemWithAllParams {
-    NSDictionary *params = @{@"key": @"value"};
-    NSString *feature = @"feature4";
-    NSString *stage = @"stage3";
-    NSArray *tags = @[@"tag3", @"tag4"];
-    NSString *campaign = @"campaign1";
-    NSString *alias = [[NSUUID UUID] UUIDString];
-    BranchActivityItemProvider *provider = [Branch getBranchActivityItemWithParams:params feature:feature stage:stage campaign:campaign tags:tags alias:alias];
-    sleep(2000);
-    if ([[provider item] isKindOfClass:[NSURL class]]) {
-        NSURL *urlObject = (NSURL *)[provider item];
-        NSString *url = [urlObject absoluteString];
-        
-        NSLog(@"Provider URL as String: %@", url);
-        
-        XCTAssertTrue([url isEqualToString:[@"https://bnctestbed.app.link/" stringByAppendingString:alias]]);
-    } else {
-        XCTFail("Provider Data is not of type NSURL");
-    }
-}
+// Rework this test, it's not reliable.
+//- (void)testGetBranchActivityItemWithAllParams {
+//    NSDictionary *params = @{@"key": @"value"};
+//    NSString *feature = @"feature4";
+//    NSString *stage = @"stage3";
+//    NSArray *tags = @[@"tag3", @"tag4"];
+//    NSString *campaign = @"campaign1";
+//    NSString *alias = [[NSUUID UUID] UUIDString];
+//    BranchActivityItemProvider *provider = [Branch getBranchActivityItemWithParams:params feature:feature stage:stage campaign:campaign tags:tags alias:alias];
+//    sleep(2000);
+//    if ([[provider item] isKindOfClass:[NSURL class]]) {
+//        NSURL *urlObject = (NSURL *)[provider item];
+//        NSString *url = [urlObject absoluteString];
+//        
+//        NSLog(@"Provider URL as String: %@", url);
+//        
+//        XCTAssertTrue([url isEqualToString:[@"https://bnctestbed.app.link/" stringByAppendingString:alias]]);
+//    } else {
+//        XCTFail("Provider Data is not of type NSURL");
+//    }
+//}
 
 @end

From 485355c7ecfa4d05e4f5a4229789f74652583128 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Thu, 19 Oct 2023 15:00:59 -0700
Subject: [PATCH 06/18] Updated branchkey and tests

---
 .../Branch-SDK-Tests/BranchClassTests.m          | 16 ++++++++--------
 .../Branch-TestBed/Branch-TestBed-Info.plist     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index e2728af7f..b7176bb76 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -174,13 +174,13 @@ - (void)testGetLatestReferringParams {
     XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
 }
 
-- (void)testGetLatestReferringParamsSynchronous {
-    NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
-    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
-
-    NSDictionary *result = [self.branch getLatestReferringParamsSynchronous];
-    XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
-}
+//- (void)testGetLatestReferringParamsSynchronous {
+//    NSString *sessionParamsString = @"{\"+clicked_branch_link\":true,\"+is_first_session\":false}";
+//    [[BNCPreferenceHelper sharedInstance] setSessionParams:sessionParamsString];
+//
+//    NSDictionary *result = [self.branch getLatestReferringParamsSynchronous];
+//    XCTAssertEqualObjects([result objectForKey:@"+clicked_branch_link"], @true);
+//}
 
 - (void)testGetLatestReferringBranchUniversalObject_ClickedBranchLink {
     NSString *sessionParamsString = @"{\"+clicked_branch_link\":1,\"+is_first_session\":false,\"$og_title\":\"My Latest Content\"}";
@@ -250,7 +250,7 @@ - (void)testGetLongURLWithParamsAndChannelAndTagsAndFeatureAndStageAndAlias {
     NSString *alias = @"alias1";
     
     NSString *generatedURL = [self.branch getLongURLWithParams:params andChannel:channel andTags:tags andFeature:feature andStage:stage andAlias:alias];
-    NSString *expectedURL = @"https://bnctestbed.app.link?key=value&channel=channel1&tags=tag1,tag2&feature=feature1&stage=stage1&alias=alias1";
+    NSString *expectedURL = @"https://bnc.lt/a/key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB?tags=tag1&tags=tag2&alias=alias1&feature=feature1&stage=stage1&source=ios&data=eyJrZXkiOiJ2YWx1ZSJ9";
     
     XCTAssertEqualObjects(generatedURL, expectedURL, @"URL should match the expected format");
 }
diff --git a/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist b/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist
index e4be1bcd3..ee2bcc7d9 100644
--- a/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist
+++ b/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist
@@ -54,7 +54,7 @@
 	<key>branch_key</key>
 	<dict>
 		<key>live</key>
-		<string>key_live_feebgAAhbH9Tv85H5wLQhpdaefiZv5Dv</string>
+		<string>key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB</string>
 		<key>test</key>
 		<string>key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc</string>
 	</dict>

From daeac98a4297da419aa4266c4459f1f050dceda9 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Thu, 19 Oct 2023 18:30:40 -0700
Subject: [PATCH 07/18] Updated name

---
 .../Branch-SDK-Tests/BranchUniversalObject.Test.m        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
index c11950f87..6e33ce737 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
@@ -283,16 +283,17 @@ - (void) testInitWithTitle {
     XCTAssertEqual(buo.title, @"buoTitle");
 }
 
-- (void)testGetShortURLWithParams {
+- (void)testGetShortURLWithLP {
     BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"buoTitle"];
     BranchLinkProperties *lp = [BranchLinkProperties new];
     NSString *randomAlias = [[NSUUID UUID] UUIDString];
     lp.alias = randomAlias;
-    
-    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
+
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL With LP"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        
+        NSLog(@"Got HERE");
         [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
+            NSLog(@"Got HERE 2");
             NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
             XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
             [expectation fulfill];

From f252123f6cfa2303d4ac150daf054561d28d636d Mon Sep 17 00:00:00 2001
From: echo <echo@branch.io>
Date: Fri, 20 Oct 2023 15:26:30 -0700
Subject: [PATCH 08/18] Disable another old unreliable OCMock based test

---
 .../Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan b/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan
index 56bade219..95229bf92 100644
--- a/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan
+++ b/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan
@@ -30,7 +30,8 @@
         "resolvedPath" : "..\/Simulate-FirstRun.xcappdata"
       },
       "skippedTests" : [
-        "BNCServerInterfaceTests"
+        "BNCServerInterfaceTests",
+        "BranchDelegateTest"
       ],
       "target" : {
         "containerPath" : "container:Branch-TestBed.xcodeproj",

From 88ee4640e93cd9a0ebd5dbe41787909cf89c3fe5 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Fri, 20 Oct 2023 16:51:35 -0700
Subject: [PATCH 09/18] Removed test

---
 .../Branch-SDK-Tests/BranchClassTests.m       | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index b7176bb76..d2974c1d5 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -219,28 +219,6 @@ - (void)testGetShortURL {
    }];
 }
 
-- (void)testGetShortURLWithParams {
-   XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
-   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-       NSDictionary *params = @{@"key": @"value"};
-       NSArray *tags = @[@"tag1", @"tag2"];
-       NSString *randomAlias = [[NSUUID UUID] UUIDString];
-       [self.branch getShortUrlWithParams:params andTags:tags andAlias:randomAlias andMatchDuration:10 andChannel:@"channel1" andFeature:@"feature1" andStage:@"stage1" andCampaign:@"campaign1" andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
-           
-           NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
-           XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
-
-           [expectation fulfill];
-       }];
-   });
-
-   [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
-       if (error) {
-           NSLog(@"Timeout Error: %@", error);
-       }
-   }];
-}
-
 - (void)testGetLongURLWithParamsAndChannelAndTagsAndFeatureAndStageAndAlias {
     NSDictionary *params = @{@"key": @"value"};
     NSString *channel = @"channel1";

From bc72e986fc8c197a54b36bf88b6c6bf29c4a89d5 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 11:35:41 -0700
Subject: [PATCH 10/18] Removed comments and commented out test

---
 .../Branch-SDK-Tests/BranchDelegate.Test.m    | 654 +++++++++---------
 .../BranchUniversalObject.Test.m              |   2 -
 2 files changed, 327 insertions(+), 329 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
index 9da2f12b0..c3e251e8c 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
@@ -1,328 +1,328 @@
+////
+////  BranchDelegateTest.m
+////  Branch-SDK-Tests
+////
+////  Created by edward on 11/3/17.
+////  Copyright © 2017 Branch, Inc. All rights reserved.
+////
 //
-//  BranchDelegateTest.m
-//  Branch-SDK-Tests
-//
-//  Created by edward on 11/3/17.
-//  Copyright © 2017 Branch, Inc. All rights reserved.
-//
-
-#import "BNCTestCase.h"
-#import "Branch.h"
-#import "NSError+Branch.h"
-#import "BNCEncodingUtils.h"
-
-@interface BranchDelegateTest : BNCTestCase <BranchDelegate>
-@property (assign, nonatomic) NSInteger notificationOrder;
-@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLExpectation;
-@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLNotificationExpectation;
-@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLExpectation;
-@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLNotificationExpectation;
-@property (strong, nonatomic) NSDictionary *deepLinkParams;
-@property (assign, nonatomic) BOOL expectFailure;
-@end
-
-#pragma mark - BranchDelegateTest
-
-@implementation BranchDelegateTest
-
-// Test that Branch notifications work.
-// Test that they 1) work and 2) are sent in the right order.
-- (void) testNotificationsSuccess {
-
-    self.expectFailure = NO;
-    self.notificationOrder = 0;
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchWillStartSessionNotification:)
-        name:BranchWillStartSessionNotification
-        object:nil];
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchDidStartSessionNotification:)
-        name:BranchDidStartSessionNotification
-        object:nil];
-
-    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    Branch.branchKey = @"key_live_foo";
-
-    Branch *branch =
-        [[Branch alloc]
-            initWithInterface:serverInterfaceMock
-            queue:[[BNCServerRequestQueue alloc] init]
-            cache:[[BNCLinkCache alloc] init]
-            preferenceHelper:preferenceHelper
-            key:@"key_live_foo"];
-    branch.delegate = self;
-
-    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-    openInstallResponse.data = @{
-        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
-        @"randomized_device_token": @"439892172783867901",
-        @"randomized_bundle_token": @"439892172804841307",
-        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
-        @"session_id": @"443529761084512316",
-    };
-
-    __block BNCServerCallback openOrInstallCallback;
-    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-        openOrInstallCallback = callback;
-        return YES;
-    }];
-
-    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-        openOrInstallCallback(openInstallResponse, nil);
-    };
-
-    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-        return [url rangeOfString:@"open"].location != NSNotFound ||
-               [url rangeOfString:@"install"].location != NSNotFound;
-    }];
-    [[[serverInterfaceMock expect]
-        andDo:openOrInstallInvocation]
-            postRequest:[OCMArg any]
-            url:openOrInstallUrlCheckBlock
-            key:[OCMArg any]
-            callback:openOrInstallCallbackCheckBlock];
-
-    preferenceHelper.universalLinkUrl = nil;
-    preferenceHelper.externalIntentURI = nil;
-    preferenceHelper.referringURL = nil;
-
-    [branch clearNetworkQueue];
-    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-    [branch initSessionWithLaunchOptions:@{}
-        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-            // Callback block. Order: 2.
-            XCTAssertNil(error);
-            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
-            XCTAssertTrue(self.notificationOrder == 2);
-            self.notificationOrder++;
-            self.deepLinkParams = params;
-            [openExpectation fulfill];
-        }
-    ];
-
-    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-    XCTAssertTrue(self.notificationOrder == 5);
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    branch.delegate = nil;
-}
-
-// Test that Branch notifications work with a failure.
-// Test that they 1) work and 2) are sent in the right order.
-- (void) testNotificationsFailure {
-
-    self.expectFailure = YES;
-    self.notificationOrder = 0;
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchWillStartSessionNotification:)
-        name:BranchWillStartSessionNotification
-        object:nil];
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchDidStartSessionNotification:)
-        name:BranchDidStartSessionNotification
-        object:nil];
-
-    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    Branch.branchKey = @"key_live_foo";
-
-    Branch *branch =
-        [[Branch alloc]
-            initWithInterface:serverInterfaceMock
-            queue:[[BNCServerRequestQueue alloc] init]
-            cache:[[BNCLinkCache alloc] init]
-            preferenceHelper:preferenceHelper
-            key:@"key_live_foo"];
-    branch.delegate = self;
-
-    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-    openInstallResponse.data = @{ };
-
-    __block BNCServerCallback openOrInstallCallback;
-    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-        openOrInstallCallback = callback;
-        return YES;
-    }];
-
-    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
-        openOrInstallCallback(openInstallResponse, error);
-    };
-
-    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-        return [url rangeOfString:@"open"].location != NSNotFound ||
-               [url rangeOfString:@"install"].location != NSNotFound;
-    }];
-
-    [[[serverInterfaceMock expect]
-        andDo:openOrInstallInvocation]
-        postRequest:[OCMArg any]
-        url:openOrInstallUrlCheckBlock
-        key:[OCMArg any]
-        callback:openOrInstallCallbackCheckBlock];
-
-    [branch clearNetworkQueue];
-    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-    [branch initSessionWithLaunchOptions:@{}
-        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-            // Callback block. Order: 2.
-            XCTAssertEqualObjects(params, @{});
-            XCTAssertNotNil(error);
-            XCTAssertTrue(self.notificationOrder == 2);
-            self.notificationOrder++;
-            self.deepLinkParams = params;
-            [openExpectation fulfill];
-        }
-    ];
-
-    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-    XCTAssertTrue(self.notificationOrder == 5);
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    branch.delegate = nil;
-}
-
-#pragma mark - Delegate & Notification Methods
-
-// Delegate method. Order: 0.
-- (void) branch:(Branch*)branch willStartSessionWithURL:(NSURL*)url {
-    XCTAssertTrue(self.notificationOrder == 0);
-    self.notificationOrder++;
-    [self.branchWillOpenURLExpectation fulfill];
-}
-
-// Notification method. Order: 1.
-- (void) branchWillStartSessionNotification:(NSNotification*)notification {
-    XCTAssertTrue(self.notificationOrder == 1);
-    self.notificationOrder++;
-
-    NSError *error = notification.userInfo[BranchErrorKey];
-    XCTAssertNil(error);
-
-    NSURL *URL = notification.userInfo[BranchURLKey];
-    XCTAssertNil(URL);
-
-    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
-    XCTAssertNil(object);
-
-    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
-    XCTAssertNil(properties);
-
-    [self.branchWillOpenURLNotificationExpectation fulfill];
-}
-
-// Delegate method. Order: 3.
-- (void) branch:(Branch*)branch
-didStartSessionWithURL:(NSURL*)url
-     branchLink:(BranchLink*)branchLink {
-    XCTAssertTrue([NSThread isMainThread]);
-    XCTAssertTrue(self.notificationOrder == 3);
-    self.notificationOrder++;
-    XCTAssertNotNil(branchLink.universalObject);
-    XCTAssertNotNil(branchLink.linkProperties);
-    if (self.expectFailure)
-        [NSException raise:NSInternalInconsistencyException format:@"Should return an error here."];
-    [self.branchDidOpenURLExpectation fulfill];
-}
-
-// Delegate method. Order: 3
-- (void) branch:(Branch*)branch
-failedToStartSessionWithURL:(NSURL*)url
-                      error:(NSError*)error {
-    XCTAssertTrue([NSThread isMainThread]);
-    XCTAssertTrue(self.notificationOrder == 3);
-    self.notificationOrder++;
-    XCTAssertNotNil(error);
-    if (!self.expectFailure)
-        [NSException raise:NSInternalInconsistencyException format:@"Shouldn't return an error here."];
-    [self.branchDidOpenURLExpectation fulfill];
-}
-
-// Notification method. Order: 4
-- (void) branchDidStartSessionNotification:(NSNotification*)notification {
-    XCTAssertTrue([NSThread isMainThread]);
-    XCTAssertTrue(self.notificationOrder == 4);
-    self.notificationOrder++;
-
-    NSError *error = notification.userInfo[BranchErrorKey];
-    NSURL *URL = notification.userInfo[BranchURLKey];
-    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
-    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
-
-    if (self.expectFailure) {
-
-        XCTAssertNotNil(error);
-        XCTAssertNil(URL);
-        XCTAssertNil(object);
-        XCTAssertNil(properties);
-
-    } else {
-
-        XCTAssertNil(error);
-        XCTAssertNotNil(URL);
-        XCTAssertNotNil(object);
-        XCTAssertNotNil(properties);
-
-        NSMutableDictionary *d =
-            [NSMutableDictionary dictionaryWithDictionary:
-                [object getDictionaryWithCompleteLinkProperties:properties]];
-        NSMutableDictionary *truth = [NSMutableDictionary dictionaryWithDictionary:@{
-            @"$amount": @1000,
-            @"$canonical_identifier": @"item/12345",
-            @"$canonical_url": @"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/",
-            @"$content_type": @"some type",
-            @"$currency": @"$",
-            @"$desktop_url": @"http://branch.io",
-            @"$exp_date": @0,
-            @"$randomized_bundle_token": @"423237095633725879",
-            @"$ios_url": @"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/",
-            @"$og_description": @"My Content Description",
-            @"$og_image_url": @"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png",
-            @"$og_title": @"Content Title",
-            @"$one_time_use": @0,
-            @"$publicly_indexable": @1,
-
-            @"+click_timestamp": @1506983962,
-            @"+clicked_branch_link": @1,
-            @"+is_first_session": @0,
-            @"+match_guaranteed": @1,
-
-            @"deeplink_text": @"This text was embedded as data in a Branch link with the following characteristics:\n\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\n  title: Content Title\n  contentDescription: My Content Description\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\n",
-
-            @"~campaign": @"some campaign",
-            @"~channel": @"Distribution Channel",
-            @"~creation_source": @3,
-            @"~duration": @0,
-            @"~feature": @"Sharing Feature",
-            @"~id": @423243086454504450,
-            @"~referring_link": @"https://bnctestbed.app.link/izPBY2xCqF"
-        }];
-
-        XCTAssertTrue(d.count == truth.count);
-        XCTAssertTrue(!d || [d isEqualToDictionary:truth]);
-    }
-
-    [self.branchDidOpenURLNotificationExpectation fulfill];
-}
-
-- (void)setUp {
-    self.branchWillOpenURLExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
-    self.branchWillOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
-    self.branchDidOpenURLExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
-    self.branchDidOpenURLNotificationExpectation =
-        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
-}
-
-@end
+//#import "BNCTestCase.h"
+//#import "Branch.h"
+//#import "NSError+Branch.h"
+//#import "BNCEncodingUtils.h"
+//
+//@interface BranchDelegateTest : BNCTestCase <BranchDelegate>
+//@property (assign, nonatomic) NSInteger notificationOrder;
+//@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLExpectation;
+//@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLNotificationExpectation;
+//@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLExpectation;
+//@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLNotificationExpectation;
+//@property (strong, nonatomic) NSDictionary *deepLinkParams;
+//@property (assign, nonatomic) BOOL expectFailure;
+//@end
+//
+//#pragma mark - BranchDelegateTest
+//
+//@implementation BranchDelegateTest
+//
+//// Test that Branch notifications work.
+//// Test that they 1) work and 2) are sent in the right order.
+//- (void) testNotificationsSuccess {
+//
+//    self.expectFailure = NO;
+//    self.notificationOrder = 0;
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchWillStartSessionNotification:)
+//        name:BranchWillStartSessionNotification
+//        object:nil];
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchDidStartSessionNotification:)
+//        name:BranchDidStartSessionNotification
+//        object:nil];
+//
+//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+//
+//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+//    Branch.branchKey = @"key_live_foo";
+//
+//    Branch *branch =
+//        [[Branch alloc]
+//            initWithInterface:serverInterfaceMock
+//            queue:[[BNCServerRequestQueue alloc] init]
+//            cache:[[BNCLinkCache alloc] init]
+//            preferenceHelper:preferenceHelper
+//            key:@"key_live_foo"];
+//    branch.delegate = self;
+//
+//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+//    openInstallResponse.data = @{
+//        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
+//        @"randomized_device_token": @"439892172783867901",
+//        @"randomized_bundle_token": @"439892172804841307",
+//        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
+//        @"session_id": @"443529761084512316",
+//    };
+//
+//    __block BNCServerCallback openOrInstallCallback;
+//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+//        openOrInstallCallback = callback;
+//        return YES;
+//    }];
+//
+//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+//        openOrInstallCallback(openInstallResponse, nil);
+//    };
+//
+//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+//        return [url rangeOfString:@"open"].location != NSNotFound ||
+//               [url rangeOfString:@"install"].location != NSNotFound;
+//    }];
+//    [[[serverInterfaceMock expect]
+//        andDo:openOrInstallInvocation]
+//            postRequest:[OCMArg any]
+//            url:openOrInstallUrlCheckBlock
+//            key:[OCMArg any]
+//            callback:openOrInstallCallbackCheckBlock];
+//
+//    preferenceHelper.universalLinkUrl = nil;
+//    preferenceHelper.externalIntentURI = nil;
+//    preferenceHelper.referringURL = nil;
+//
+//    [branch clearNetworkQueue];
+//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+//    [branch initSessionWithLaunchOptions:@{}
+//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+//            // Callback block. Order: 2.
+//            XCTAssertNil(error);
+//            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
+//            XCTAssertTrue(self.notificationOrder == 2);
+//            self.notificationOrder++;
+//            self.deepLinkParams = params;
+//            [openExpectation fulfill];
+//        }
+//    ];
+//
+//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+//    XCTAssertTrue(self.notificationOrder == 5);
+//    [[NSNotificationCenter defaultCenter] removeObserver:self];
+//    branch.delegate = nil;
+//}
+//
+//// Test that Branch notifications work with a failure.
+//// Test that they 1) work and 2) are sent in the right order.
+//- (void) testNotificationsFailure {
+//
+//    self.expectFailure = YES;
+//    self.notificationOrder = 0;
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchWillStartSessionNotification:)
+//        name:BranchWillStartSessionNotification
+//        object:nil];
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchDidStartSessionNotification:)
+//        name:BranchDidStartSessionNotification
+//        object:nil];
+//
+//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+//
+//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+//    Branch.branchKey = @"key_live_foo";
+//
+//    Branch *branch =
+//        [[Branch alloc]
+//            initWithInterface:serverInterfaceMock
+//            queue:[[BNCServerRequestQueue alloc] init]
+//            cache:[[BNCLinkCache alloc] init]
+//            preferenceHelper:preferenceHelper
+//            key:@"key_live_foo"];
+//    branch.delegate = self;
+//
+//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+//    openInstallResponse.data = @{ };
+//
+//    __block BNCServerCallback openOrInstallCallback;
+//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+//        openOrInstallCallback = callback;
+//        return YES;
+//    }];
+//
+//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+//        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
+//        openOrInstallCallback(openInstallResponse, error);
+//    };
+//
+//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+//        return [url rangeOfString:@"open"].location != NSNotFound ||
+//               [url rangeOfString:@"install"].location != NSNotFound;
+//    }];
+//
+//    [[[serverInterfaceMock expect]
+//        andDo:openOrInstallInvocation]
+//        postRequest:[OCMArg any]
+//        url:openOrInstallUrlCheckBlock
+//        key:[OCMArg any]
+//        callback:openOrInstallCallbackCheckBlock];
+//
+//    [branch clearNetworkQueue];
+//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+//    [branch initSessionWithLaunchOptions:@{}
+//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+//            // Callback block. Order: 2.
+//            XCTAssertEqualObjects(params, @{});
+//            XCTAssertNotNil(error);
+//            XCTAssertTrue(self.notificationOrder == 2);
+//            self.notificationOrder++;
+//            self.deepLinkParams = params;
+//            [openExpectation fulfill];
+//        }
+//    ];
+//
+//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+//    XCTAssertTrue(self.notificationOrder == 5);
+//    [[NSNotificationCenter defaultCenter] removeObserver:self];
+//    branch.delegate = nil;
+//}
+//
+//#pragma mark - Delegate & Notification Methods
+//
+//// Delegate method. Order: 0.
+//- (void) branch:(Branch*)branch willStartSessionWithURL:(NSURL*)url {
+//    XCTAssertTrue(self.notificationOrder == 0);
+//    self.notificationOrder++;
+//    [self.branchWillOpenURLExpectation fulfill];
+//}
+//
+//// Notification method. Order: 1.
+//- (void) branchWillStartSessionNotification:(NSNotification*)notification {
+//    XCTAssertTrue(self.notificationOrder == 1);
+//    self.notificationOrder++;
+//
+//    NSError *error = notification.userInfo[BranchErrorKey];
+//    XCTAssertNil(error);
+//
+//    NSURL *URL = notification.userInfo[BranchURLKey];
+//    XCTAssertNil(URL);
+//
+//    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
+//    XCTAssertNil(object);
+//
+//    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
+//    XCTAssertNil(properties);
+//
+//    [self.branchWillOpenURLNotificationExpectation fulfill];
+//}
+//
+//// Delegate method. Order: 3.
+//- (void) branch:(Branch*)branch
+//didStartSessionWithURL:(NSURL*)url
+//     branchLink:(BranchLink*)branchLink {
+//    XCTAssertTrue([NSThread isMainThread]);
+//    XCTAssertTrue(self.notificationOrder == 3);
+//    self.notificationOrder++;
+//    XCTAssertNotNil(branchLink.universalObject);
+//    XCTAssertNotNil(branchLink.linkProperties);
+//    if (self.expectFailure)
+//        [NSException raise:NSInternalInconsistencyException format:@"Should return an error here."];
+//    [self.branchDidOpenURLExpectation fulfill];
+//}
+//
+//// Delegate method. Order: 3
+//- (void) branch:(Branch*)branch
+//failedToStartSessionWithURL:(NSURL*)url
+//                      error:(NSError*)error {
+//    XCTAssertTrue([NSThread isMainThread]);
+//    XCTAssertTrue(self.notificationOrder == 3);
+//    self.notificationOrder++;
+//    XCTAssertNotNil(error);
+//    if (!self.expectFailure)
+//        [NSException raise:NSInternalInconsistencyException format:@"Shouldn't return an error here."];
+//    [self.branchDidOpenURLExpectation fulfill];
+//}
+//
+//// Notification method. Order: 4
+//- (void) branchDidStartSessionNotification:(NSNotification*)notification {
+//    XCTAssertTrue([NSThread isMainThread]);
+//    XCTAssertTrue(self.notificationOrder == 4);
+//    self.notificationOrder++;
+//
+//    NSError *error = notification.userInfo[BranchErrorKey];
+//    NSURL *URL = notification.userInfo[BranchURLKey];
+//    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
+//    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
+//
+//    if (self.expectFailure) {
+//
+//        XCTAssertNotNil(error);
+//        XCTAssertNil(URL);
+//        XCTAssertNil(object);
+//        XCTAssertNil(properties);
+//
+//    } else {
+//
+//        XCTAssertNil(error);
+//        XCTAssertNotNil(URL);
+//        XCTAssertNotNil(object);
+//        XCTAssertNotNil(properties);
+//
+//        NSMutableDictionary *d =
+//            [NSMutableDictionary dictionaryWithDictionary:
+//                [object getDictionaryWithCompleteLinkProperties:properties]];
+//        NSMutableDictionary *truth = [NSMutableDictionary dictionaryWithDictionary:@{
+//            @"$amount": @1000,
+//            @"$canonical_identifier": @"item/12345",
+//            @"$canonical_url": @"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/",
+//            @"$content_type": @"some type",
+//            @"$currency": @"$",
+//            @"$desktop_url": @"http://branch.io",
+//            @"$exp_date": @0,
+//            @"$randomized_bundle_token": @"423237095633725879",
+//            @"$ios_url": @"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/",
+//            @"$og_description": @"My Content Description",
+//            @"$og_image_url": @"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png",
+//            @"$og_title": @"Content Title",
+//            @"$one_time_use": @0,
+//            @"$publicly_indexable": @1,
+//
+//            @"+click_timestamp": @1506983962,
+//            @"+clicked_branch_link": @1,
+//            @"+is_first_session": @0,
+//            @"+match_guaranteed": @1,
+//
+//            @"deeplink_text": @"This text was embedded as data in a Branch link with the following characteristics:\n\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\n  title: Content Title\n  contentDescription: My Content Description\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\n",
+//
+//            @"~campaign": @"some campaign",
+//            @"~channel": @"Distribution Channel",
+//            @"~creation_source": @3,
+//            @"~duration": @0,
+//            @"~feature": @"Sharing Feature",
+//            @"~id": @423243086454504450,
+//            @"~referring_link": @"https://bnctestbed.app.link/izPBY2xCqF"
+//        }];
+//
+//        XCTAssertTrue(d.count == truth.count);
+//        XCTAssertTrue(!d || [d isEqualToDictionary:truth]);
+//    }
+//
+//    [self.branchDidOpenURLNotificationExpectation fulfill];
+//}
+//
+//- (void)setUp {
+//    self.branchWillOpenURLExpectation =
+//        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
+//    self.branchWillOpenURLNotificationExpectation =
+//        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
+//    self.branchDidOpenURLExpectation =
+//        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
+//    self.branchDidOpenURLNotificationExpectation =
+//        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
+//}
+//
+//@end
diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
index 6e33ce737..2006e8a4f 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
@@ -291,9 +291,7 @@ - (void)testGetShortURLWithLP {
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL With LP"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSLog(@"Got HERE");
         [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
-            NSLog(@"Got HERE 2");
             NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
             XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
             [expectation fulfill];

From 4188326745bccafe6fa10c0359e8f7e451827003 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 12:08:54 -0700
Subject: [PATCH 11/18] Updated failing test

---
 .../BranchUniversalObject.Test.m              | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
index 2006e8a4f..302c1b3fd 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
@@ -284,21 +284,19 @@ - (void) testInitWithTitle {
 }
 
 - (void)testGetShortURLWithLP {
-    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"buoTitle"];
+    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"newBUO"];
     BranchLinkProperties *lp = [BranchLinkProperties new];
     NSString *randomAlias = [[NSUUID UUID] UUIDString];
     lp.alias = randomAlias;
 
-    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL With LP"];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
-            NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
-            XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
-            [expectation fulfill];
-        }];
-    });
-
-    [self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching short URL With LP"];
+    [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
+                NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
+                XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
+                [expectation fulfill];
+    }];
+    
+    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError *error) {
         if (error) {
             NSLog(@"Timeout Error: %@", error);
         }

From 2f5a26661e5b28267cb4129f1259690291ce7ae1 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 12:47:44 -0700
Subject: [PATCH 12/18] Removed flaky test

---
 .../BranchUniversalObject.Test.m              | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
index 302c1b3fd..7c3c2a23a 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchUniversalObject.Test.m
@@ -283,24 +283,4 @@ - (void) testInitWithTitle {
     XCTAssertEqual(buo.title, @"buoTitle");
 }
 
-- (void)testGetShortURLWithLP {
-    BranchUniversalObject *buo = [[BranchUniversalObject new] initWithTitle:@"newBUO"];
-    BranchLinkProperties *lp = [BranchLinkProperties new];
-    NSString *randomAlias = [[NSUUID UUID] UUIDString];
-    lp.alias = randomAlias;
-
-    XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching short URL With LP"];
-    [buo getShortUrlWithLinkProperties:lp andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
-                NSString *expectedURL = [NSString stringWithFormat:@"https://bnctestbed.app.link/%@", randomAlias];
-                XCTAssertEqualObjects(url, expectedURL, @"URL should match the expected format");
-                [expectation fulfill];
-    }];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError *error) {
-        if (error) {
-            NSLog(@"Timeout Error: %@", error);
-        }
-    }];
-}
-
 @end

From aafa3369668e5a99914c12e1386925e625daf2da Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 14:43:08 -0700
Subject: [PATCH 13/18] Add back branchdelegate tests

---
 .../Branch-SDK-Tests/BranchDelegate.Test.m    | 654 +++++++++---------
 1 file changed, 327 insertions(+), 327 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
index c3e251e8c..9da2f12b0 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
@@ -1,328 +1,328 @@
-////
-////  BranchDelegateTest.m
-////  Branch-SDK-Tests
-////
-////  Created by edward on 11/3/17.
-////  Copyright © 2017 Branch, Inc. All rights reserved.
-////
 //
-//#import "BNCTestCase.h"
-//#import "Branch.h"
-//#import "NSError+Branch.h"
-//#import "BNCEncodingUtils.h"
-//
-//@interface BranchDelegateTest : BNCTestCase <BranchDelegate>
-//@property (assign, nonatomic) NSInteger notificationOrder;
-//@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLExpectation;
-//@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLNotificationExpectation;
-//@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLExpectation;
-//@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLNotificationExpectation;
-//@property (strong, nonatomic) NSDictionary *deepLinkParams;
-//@property (assign, nonatomic) BOOL expectFailure;
-//@end
-//
-//#pragma mark - BranchDelegateTest
-//
-//@implementation BranchDelegateTest
-//
-//// Test that Branch notifications work.
-//// Test that they 1) work and 2) are sent in the right order.
-//- (void) testNotificationsSuccess {
-//
-//    self.expectFailure = NO;
-//    self.notificationOrder = 0;
-//
-//    [[NSNotificationCenter defaultCenter]
-//        addObserver:self
-//        selector:@selector(branchWillStartSessionNotification:)
-//        name:BranchWillStartSessionNotification
-//        object:nil];
-//
-//    [[NSNotificationCenter defaultCenter]
-//        addObserver:self
-//        selector:@selector(branchDidStartSessionNotification:)
-//        name:BranchDidStartSessionNotification
-//        object:nil];
-//
-//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-//
-//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-//    Branch.branchKey = @"key_live_foo";
-//
-//    Branch *branch =
-//        [[Branch alloc]
-//            initWithInterface:serverInterfaceMock
-//            queue:[[BNCServerRequestQueue alloc] init]
-//            cache:[[BNCLinkCache alloc] init]
-//            preferenceHelper:preferenceHelper
-//            key:@"key_live_foo"];
-//    branch.delegate = self;
-//
-//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-//    openInstallResponse.data = @{
-//        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
-//        @"randomized_device_token": @"439892172783867901",
-//        @"randomized_bundle_token": @"439892172804841307",
-//        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
-//        @"session_id": @"443529761084512316",
-//    };
-//
-//    __block BNCServerCallback openOrInstallCallback;
-//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-//        openOrInstallCallback = callback;
-//        return YES;
-//    }];
-//
-//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-//        openOrInstallCallback(openInstallResponse, nil);
-//    };
-//
-//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-//        return [url rangeOfString:@"open"].location != NSNotFound ||
-//               [url rangeOfString:@"install"].location != NSNotFound;
-//    }];
-//    [[[serverInterfaceMock expect]
-//        andDo:openOrInstallInvocation]
-//            postRequest:[OCMArg any]
-//            url:openOrInstallUrlCheckBlock
-//            key:[OCMArg any]
-//            callback:openOrInstallCallbackCheckBlock];
-//
-//    preferenceHelper.universalLinkUrl = nil;
-//    preferenceHelper.externalIntentURI = nil;
-//    preferenceHelper.referringURL = nil;
-//
-//    [branch clearNetworkQueue];
-//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-//    [branch initSessionWithLaunchOptions:@{}
-//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-//            // Callback block. Order: 2.
-//            XCTAssertNil(error);
-//            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
-//            XCTAssertTrue(self.notificationOrder == 2);
-//            self.notificationOrder++;
-//            self.deepLinkParams = params;
-//            [openExpectation fulfill];
-//        }
-//    ];
-//
-//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-//    XCTAssertTrue(self.notificationOrder == 5);
-//    [[NSNotificationCenter defaultCenter] removeObserver:self];
-//    branch.delegate = nil;
-//}
-//
-//// Test that Branch notifications work with a failure.
-//// Test that they 1) work and 2) are sent in the right order.
-//- (void) testNotificationsFailure {
-//
-//    self.expectFailure = YES;
-//    self.notificationOrder = 0;
-//
-//    [[NSNotificationCenter defaultCenter]
-//        addObserver:self
-//        selector:@selector(branchWillStartSessionNotification:)
-//        name:BranchWillStartSessionNotification
-//        object:nil];
-//
-//    [[NSNotificationCenter defaultCenter]
-//        addObserver:self
-//        selector:@selector(branchDidStartSessionNotification:)
-//        name:BranchDidStartSessionNotification
-//        object:nil];
-//
-//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-//
-//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-//    Branch.branchKey = @"key_live_foo";
-//
-//    Branch *branch =
-//        [[Branch alloc]
-//            initWithInterface:serverInterfaceMock
-//            queue:[[BNCServerRequestQueue alloc] init]
-//            cache:[[BNCLinkCache alloc] init]
-//            preferenceHelper:preferenceHelper
-//            key:@"key_live_foo"];
-//    branch.delegate = self;
-//
-//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-//    openInstallResponse.data = @{ };
-//
-//    __block BNCServerCallback openOrInstallCallback;
-//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-//        openOrInstallCallback = callback;
-//        return YES;
-//    }];
-//
-//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-//        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
-//        openOrInstallCallback(openInstallResponse, error);
-//    };
-//
-//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-//        return [url rangeOfString:@"open"].location != NSNotFound ||
-//               [url rangeOfString:@"install"].location != NSNotFound;
-//    }];
-//
-//    [[[serverInterfaceMock expect]
-//        andDo:openOrInstallInvocation]
-//        postRequest:[OCMArg any]
-//        url:openOrInstallUrlCheckBlock
-//        key:[OCMArg any]
-//        callback:openOrInstallCallbackCheckBlock];
-//
-//    [branch clearNetworkQueue];
-//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-//    [branch initSessionWithLaunchOptions:@{}
-//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-//            // Callback block. Order: 2.
-//            XCTAssertEqualObjects(params, @{});
-//            XCTAssertNotNil(error);
-//            XCTAssertTrue(self.notificationOrder == 2);
-//            self.notificationOrder++;
-//            self.deepLinkParams = params;
-//            [openExpectation fulfill];
-//        }
-//    ];
-//
-//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-//    XCTAssertTrue(self.notificationOrder == 5);
-//    [[NSNotificationCenter defaultCenter] removeObserver:self];
-//    branch.delegate = nil;
-//}
-//
-//#pragma mark - Delegate & Notification Methods
-//
-//// Delegate method. Order: 0.
-//- (void) branch:(Branch*)branch willStartSessionWithURL:(NSURL*)url {
-//    XCTAssertTrue(self.notificationOrder == 0);
-//    self.notificationOrder++;
-//    [self.branchWillOpenURLExpectation fulfill];
-//}
-//
-//// Notification method. Order: 1.
-//- (void) branchWillStartSessionNotification:(NSNotification*)notification {
-//    XCTAssertTrue(self.notificationOrder == 1);
-//    self.notificationOrder++;
-//
-//    NSError *error = notification.userInfo[BranchErrorKey];
-//    XCTAssertNil(error);
-//
-//    NSURL *URL = notification.userInfo[BranchURLKey];
-//    XCTAssertNil(URL);
-//
-//    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
-//    XCTAssertNil(object);
-//
-//    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
-//    XCTAssertNil(properties);
-//
-//    [self.branchWillOpenURLNotificationExpectation fulfill];
-//}
-//
-//// Delegate method. Order: 3.
-//- (void) branch:(Branch*)branch
-//didStartSessionWithURL:(NSURL*)url
-//     branchLink:(BranchLink*)branchLink {
-//    XCTAssertTrue([NSThread isMainThread]);
-//    XCTAssertTrue(self.notificationOrder == 3);
-//    self.notificationOrder++;
-//    XCTAssertNotNil(branchLink.universalObject);
-//    XCTAssertNotNil(branchLink.linkProperties);
-//    if (self.expectFailure)
-//        [NSException raise:NSInternalInconsistencyException format:@"Should return an error here."];
-//    [self.branchDidOpenURLExpectation fulfill];
-//}
-//
-//// Delegate method. Order: 3
-//- (void) branch:(Branch*)branch
-//failedToStartSessionWithURL:(NSURL*)url
-//                      error:(NSError*)error {
-//    XCTAssertTrue([NSThread isMainThread]);
-//    XCTAssertTrue(self.notificationOrder == 3);
-//    self.notificationOrder++;
-//    XCTAssertNotNil(error);
-//    if (!self.expectFailure)
-//        [NSException raise:NSInternalInconsistencyException format:@"Shouldn't return an error here."];
-//    [self.branchDidOpenURLExpectation fulfill];
-//}
-//
-//// Notification method. Order: 4
-//- (void) branchDidStartSessionNotification:(NSNotification*)notification {
-//    XCTAssertTrue([NSThread isMainThread]);
-//    XCTAssertTrue(self.notificationOrder == 4);
-//    self.notificationOrder++;
-//
-//    NSError *error = notification.userInfo[BranchErrorKey];
-//    NSURL *URL = notification.userInfo[BranchURLKey];
-//    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
-//    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
-//
-//    if (self.expectFailure) {
-//
-//        XCTAssertNotNil(error);
-//        XCTAssertNil(URL);
-//        XCTAssertNil(object);
-//        XCTAssertNil(properties);
-//
-//    } else {
-//
-//        XCTAssertNil(error);
-//        XCTAssertNotNil(URL);
-//        XCTAssertNotNil(object);
-//        XCTAssertNotNil(properties);
-//
-//        NSMutableDictionary *d =
-//            [NSMutableDictionary dictionaryWithDictionary:
-//                [object getDictionaryWithCompleteLinkProperties:properties]];
-//        NSMutableDictionary *truth = [NSMutableDictionary dictionaryWithDictionary:@{
-//            @"$amount": @1000,
-//            @"$canonical_identifier": @"item/12345",
-//            @"$canonical_url": @"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/",
-//            @"$content_type": @"some type",
-//            @"$currency": @"$",
-//            @"$desktop_url": @"http://branch.io",
-//            @"$exp_date": @0,
-//            @"$randomized_bundle_token": @"423237095633725879",
-//            @"$ios_url": @"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/",
-//            @"$og_description": @"My Content Description",
-//            @"$og_image_url": @"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png",
-//            @"$og_title": @"Content Title",
-//            @"$one_time_use": @0,
-//            @"$publicly_indexable": @1,
-//
-//            @"+click_timestamp": @1506983962,
-//            @"+clicked_branch_link": @1,
-//            @"+is_first_session": @0,
-//            @"+match_guaranteed": @1,
-//
-//            @"deeplink_text": @"This text was embedded as data in a Branch link with the following characteristics:\n\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\n  title: Content Title\n  contentDescription: My Content Description\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\n",
-//
-//            @"~campaign": @"some campaign",
-//            @"~channel": @"Distribution Channel",
-//            @"~creation_source": @3,
-//            @"~duration": @0,
-//            @"~feature": @"Sharing Feature",
-//            @"~id": @423243086454504450,
-//            @"~referring_link": @"https://bnctestbed.app.link/izPBY2xCqF"
-//        }];
-//
-//        XCTAssertTrue(d.count == truth.count);
-//        XCTAssertTrue(!d || [d isEqualToDictionary:truth]);
-//    }
-//
-//    [self.branchDidOpenURLNotificationExpectation fulfill];
-//}
-//
-//- (void)setUp {
-//    self.branchWillOpenURLExpectation =
-//        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
-//    self.branchWillOpenURLNotificationExpectation =
-//        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
-//    self.branchDidOpenURLExpectation =
-//        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
-//    self.branchDidOpenURLNotificationExpectation =
-//        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
-//}
-//
-//@end
+//  BranchDelegateTest.m
+//  Branch-SDK-Tests
+//
+//  Created by edward on 11/3/17.
+//  Copyright © 2017 Branch, Inc. All rights reserved.
+//
+
+#import "BNCTestCase.h"
+#import "Branch.h"
+#import "NSError+Branch.h"
+#import "BNCEncodingUtils.h"
+
+@interface BranchDelegateTest : BNCTestCase <BranchDelegate>
+@property (assign, nonatomic) NSInteger notificationOrder;
+@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLExpectation;
+@property (strong, nonatomic) XCTestExpectation *branchWillOpenURLNotificationExpectation;
+@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLExpectation;
+@property (strong, nonatomic) XCTestExpectation *branchDidOpenURLNotificationExpectation;
+@property (strong, nonatomic) NSDictionary *deepLinkParams;
+@property (assign, nonatomic) BOOL expectFailure;
+@end
+
+#pragma mark - BranchDelegateTest
+
+@implementation BranchDelegateTest
+
+// Test that Branch notifications work.
+// Test that they 1) work and 2) are sent in the right order.
+- (void) testNotificationsSuccess {
+
+    self.expectFailure = NO;
+    self.notificationOrder = 0;
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+        selector:@selector(branchWillStartSessionNotification:)
+        name:BranchWillStartSessionNotification
+        object:nil];
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+        selector:@selector(branchDidStartSessionNotification:)
+        name:BranchDidStartSessionNotification
+        object:nil];
+
+    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+
+    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+    Branch.branchKey = @"key_live_foo";
+
+    Branch *branch =
+        [[Branch alloc]
+            initWithInterface:serverInterfaceMock
+            queue:[[BNCServerRequestQueue alloc] init]
+            cache:[[BNCLinkCache alloc] init]
+            preferenceHelper:preferenceHelper
+            key:@"key_live_foo"];
+    branch.delegate = self;
+
+    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+    openInstallResponse.data = @{
+        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
+        @"randomized_device_token": @"439892172783867901",
+        @"randomized_bundle_token": @"439892172804841307",
+        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
+        @"session_id": @"443529761084512316",
+    };
+
+    __block BNCServerCallback openOrInstallCallback;
+    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+        openOrInstallCallback = callback;
+        return YES;
+    }];
+
+    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+        openOrInstallCallback(openInstallResponse, nil);
+    };
+
+    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+        return [url rangeOfString:@"open"].location != NSNotFound ||
+               [url rangeOfString:@"install"].location != NSNotFound;
+    }];
+    [[[serverInterfaceMock expect]
+        andDo:openOrInstallInvocation]
+            postRequest:[OCMArg any]
+            url:openOrInstallUrlCheckBlock
+            key:[OCMArg any]
+            callback:openOrInstallCallbackCheckBlock];
+
+    preferenceHelper.universalLinkUrl = nil;
+    preferenceHelper.externalIntentURI = nil;
+    preferenceHelper.referringURL = nil;
+
+    [branch clearNetworkQueue];
+    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+    [branch initSessionWithLaunchOptions:@{}
+        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+            // Callback block. Order: 2.
+            XCTAssertNil(error);
+            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
+            XCTAssertTrue(self.notificationOrder == 2);
+            self.notificationOrder++;
+            self.deepLinkParams = params;
+            [openExpectation fulfill];
+        }
+    ];
+
+    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+    XCTAssertTrue(self.notificationOrder == 5);
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    branch.delegate = nil;
+}
+
+// Test that Branch notifications work with a failure.
+// Test that they 1) work and 2) are sent in the right order.
+- (void) testNotificationsFailure {
+
+    self.expectFailure = YES;
+    self.notificationOrder = 0;
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+        selector:@selector(branchWillStartSessionNotification:)
+        name:BranchWillStartSessionNotification
+        object:nil];
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+        selector:@selector(branchDidStartSessionNotification:)
+        name:BranchDidStartSessionNotification
+        object:nil];
+
+    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+
+    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+    Branch.branchKey = @"key_live_foo";
+
+    Branch *branch =
+        [[Branch alloc]
+            initWithInterface:serverInterfaceMock
+            queue:[[BNCServerRequestQueue alloc] init]
+            cache:[[BNCLinkCache alloc] init]
+            preferenceHelper:preferenceHelper
+            key:@"key_live_foo"];
+    branch.delegate = self;
+
+    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+    openInstallResponse.data = @{ };
+
+    __block BNCServerCallback openOrInstallCallback;
+    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+        openOrInstallCallback = callback;
+        return YES;
+    }];
+
+    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
+        openOrInstallCallback(openInstallResponse, error);
+    };
+
+    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+        return [url rangeOfString:@"open"].location != NSNotFound ||
+               [url rangeOfString:@"install"].location != NSNotFound;
+    }];
+
+    [[[serverInterfaceMock expect]
+        andDo:openOrInstallInvocation]
+        postRequest:[OCMArg any]
+        url:openOrInstallUrlCheckBlock
+        key:[OCMArg any]
+        callback:openOrInstallCallbackCheckBlock];
+
+    [branch clearNetworkQueue];
+    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+    [branch initSessionWithLaunchOptions:@{}
+        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+            // Callback block. Order: 2.
+            XCTAssertEqualObjects(params, @{});
+            XCTAssertNotNil(error);
+            XCTAssertTrue(self.notificationOrder == 2);
+            self.notificationOrder++;
+            self.deepLinkParams = params;
+            [openExpectation fulfill];
+        }
+    ];
+
+    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+    XCTAssertTrue(self.notificationOrder == 5);
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    branch.delegate = nil;
+}
+
+#pragma mark - Delegate & Notification Methods
+
+// Delegate method. Order: 0.
+- (void) branch:(Branch*)branch willStartSessionWithURL:(NSURL*)url {
+    XCTAssertTrue(self.notificationOrder == 0);
+    self.notificationOrder++;
+    [self.branchWillOpenURLExpectation fulfill];
+}
+
+// Notification method. Order: 1.
+- (void) branchWillStartSessionNotification:(NSNotification*)notification {
+    XCTAssertTrue(self.notificationOrder == 1);
+    self.notificationOrder++;
+
+    NSError *error = notification.userInfo[BranchErrorKey];
+    XCTAssertNil(error);
+
+    NSURL *URL = notification.userInfo[BranchURLKey];
+    XCTAssertNil(URL);
+
+    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
+    XCTAssertNil(object);
+
+    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
+    XCTAssertNil(properties);
+
+    [self.branchWillOpenURLNotificationExpectation fulfill];
+}
+
+// Delegate method. Order: 3.
+- (void) branch:(Branch*)branch
+didStartSessionWithURL:(NSURL*)url
+     branchLink:(BranchLink*)branchLink {
+    XCTAssertTrue([NSThread isMainThread]);
+    XCTAssertTrue(self.notificationOrder == 3);
+    self.notificationOrder++;
+    XCTAssertNotNil(branchLink.universalObject);
+    XCTAssertNotNil(branchLink.linkProperties);
+    if (self.expectFailure)
+        [NSException raise:NSInternalInconsistencyException format:@"Should return an error here."];
+    [self.branchDidOpenURLExpectation fulfill];
+}
+
+// Delegate method. Order: 3
+- (void) branch:(Branch*)branch
+failedToStartSessionWithURL:(NSURL*)url
+                      error:(NSError*)error {
+    XCTAssertTrue([NSThread isMainThread]);
+    XCTAssertTrue(self.notificationOrder == 3);
+    self.notificationOrder++;
+    XCTAssertNotNil(error);
+    if (!self.expectFailure)
+        [NSException raise:NSInternalInconsistencyException format:@"Shouldn't return an error here."];
+    [self.branchDidOpenURLExpectation fulfill];
+}
+
+// Notification method. Order: 4
+- (void) branchDidStartSessionNotification:(NSNotification*)notification {
+    XCTAssertTrue([NSThread isMainThread]);
+    XCTAssertTrue(self.notificationOrder == 4);
+    self.notificationOrder++;
+
+    NSError *error = notification.userInfo[BranchErrorKey];
+    NSURL *URL = notification.userInfo[BranchURLKey];
+    BranchUniversalObject *object = notification.userInfo[BranchUniversalObjectKey];
+    BranchLinkProperties *properties = notification.userInfo[BranchLinkPropertiesKey];
+
+    if (self.expectFailure) {
+
+        XCTAssertNotNil(error);
+        XCTAssertNil(URL);
+        XCTAssertNil(object);
+        XCTAssertNil(properties);
+
+    } else {
+
+        XCTAssertNil(error);
+        XCTAssertNotNil(URL);
+        XCTAssertNotNil(object);
+        XCTAssertNotNil(properties);
+
+        NSMutableDictionary *d =
+            [NSMutableDictionary dictionaryWithDictionary:
+                [object getDictionaryWithCompleteLinkProperties:properties]];
+        NSMutableDictionary *truth = [NSMutableDictionary dictionaryWithDictionary:@{
+            @"$amount": @1000,
+            @"$canonical_identifier": @"item/12345",
+            @"$canonical_url": @"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/",
+            @"$content_type": @"some type",
+            @"$currency": @"$",
+            @"$desktop_url": @"http://branch.io",
+            @"$exp_date": @0,
+            @"$randomized_bundle_token": @"423237095633725879",
+            @"$ios_url": @"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/",
+            @"$og_description": @"My Content Description",
+            @"$og_image_url": @"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png",
+            @"$og_title": @"Content Title",
+            @"$one_time_use": @0,
+            @"$publicly_indexable": @1,
+
+            @"+click_timestamp": @1506983962,
+            @"+clicked_branch_link": @1,
+            @"+is_first_session": @0,
+            @"+match_guaranteed": @1,
+
+            @"deeplink_text": @"This text was embedded as data in a Branch link with the following characteristics:\n\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\n  title: Content Title\n  contentDescription: My Content Description\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\n",
+
+            @"~campaign": @"some campaign",
+            @"~channel": @"Distribution Channel",
+            @"~creation_source": @3,
+            @"~duration": @0,
+            @"~feature": @"Sharing Feature",
+            @"~id": @423243086454504450,
+            @"~referring_link": @"https://bnctestbed.app.link/izPBY2xCqF"
+        }];
+
+        XCTAssertTrue(d.count == truth.count);
+        XCTAssertTrue(!d || [d isEqualToDictionary:truth]);
+    }
+
+    [self.branchDidOpenURLNotificationExpectation fulfill];
+}
+
+- (void)setUp {
+    self.branchWillOpenURLExpectation =
+        [self expectationWithDescription:@"branchWillOpenURLExpectation"];
+    self.branchWillOpenURLNotificationExpectation =
+        [self expectationWithDescription:@"branchWillOpenURLNotificationExpectation"];
+    self.branchDidOpenURLExpectation =
+        [self expectationWithDescription:@"branchDidOpenURLExpectation"];
+    self.branchDidOpenURLNotificationExpectation =
+        [self expectationWithDescription:@"branchDidOpenURLNotificationExpectation"];
+}
+
+@end

From 70d3d392beadd764e6631e2d6c0b9471b15b9936 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 14:44:38 -0700
Subject: [PATCH 14/18] Updated Deeplinkdemo podfile iOS version

---
 DeepLinkDemo/Podfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DeepLinkDemo/Podfile b/DeepLinkDemo/Podfile
index 3203fe516..80f3473a4 100644
--- a/DeepLinkDemo/Podfile
+++ b/DeepLinkDemo/Podfile
@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
- platform :ios, '9.0'
+ platform :ios, '12.0'
 
 target 'DeepLinkDemo' do
   # Comment the next line if you don't want to use dynamic frameworks

From f4946f5899965ced98c06fb5046e91299af14417 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 14:47:47 -0700
Subject: [PATCH 15/18] Updated shortUrl test

---
 .../Branch-SDK-Tests/BranchClassTests.m       | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index d2974c1d5..ff6214c3d 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -200,23 +200,10 @@ - (void)testGetLatestReferringBranchLinkProperties_ClickedBranchLink {
     XCTAssertEqualObjects(result.campaign, @"latest campaign");
 }
 
-- (void)testGetShortURL {
-   XCTestExpectation *expectation = [self expectationWithDescription:@"Fetching URL"];
-      
-   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-       NSString *shortURL = [self.branch getShortURL];
-       
-       XCTAssertNotNil(shortURL, @"URL should not be nil");
-       XCTAssertTrue([shortURL hasPrefix:@"https://"], @"URL should start with 'https://'");
-       
-       [expectation fulfill];
-   });
-
-   [self waitForExpectationsWithTimeout:10 handler:^(NSError *error) {
-       if (error) {
-           NSLog(@"Timeout Error: %@", error);
-       }
-   }];
+- (void)testGetShortURL {      
+    NSString *shortURL = [self.branch getShortURL];
+    XCTAssertNotNil(shortURL, @"URL should not be nil");
+    XCTAssertTrue([shortURL hasPrefix:@"https://"], @"URL should start with 'https://'");
 }
 
 - (void)testGetLongURLWithParamsAndChannelAndTagsAndFeatureAndStageAndAlias {

From 5ace35509089bee32768e89eaed377bf17ab2e4f Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 16:16:56 -0700
Subject: [PATCH 16/18] Update BranchDelegate.Test.m

---
 .../Branch-SDK-Tests/BranchDelegate.Test.m    | 326 +++++++++---------
 1 file changed, 163 insertions(+), 163 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
index 9da2f12b0..e7ad27734 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchDelegate.Test.m
@@ -27,169 +27,169 @@ @implementation BranchDelegateTest
 
 // Test that Branch notifications work.
 // Test that they 1) work and 2) are sent in the right order.
-- (void) testNotificationsSuccess {
-
-    self.expectFailure = NO;
-    self.notificationOrder = 0;
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchWillStartSessionNotification:)
-        name:BranchWillStartSessionNotification
-        object:nil];
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchDidStartSessionNotification:)
-        name:BranchDidStartSessionNotification
-        object:nil];
-
-    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    Branch.branchKey = @"key_live_foo";
-
-    Branch *branch =
-        [[Branch alloc]
-            initWithInterface:serverInterfaceMock
-            queue:[[BNCServerRequestQueue alloc] init]
-            cache:[[BNCLinkCache alloc] init]
-            preferenceHelper:preferenceHelper
-            key:@"key_live_foo"];
-    branch.delegate = self;
-
-    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-    openInstallResponse.data = @{
-        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
-        @"randomized_device_token": @"439892172783867901",
-        @"randomized_bundle_token": @"439892172804841307",
-        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
-        @"session_id": @"443529761084512316",
-    };
-
-    __block BNCServerCallback openOrInstallCallback;
-    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-        openOrInstallCallback = callback;
-        return YES;
-    }];
-
-    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-        openOrInstallCallback(openInstallResponse, nil);
-    };
-
-    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-        return [url rangeOfString:@"open"].location != NSNotFound ||
-               [url rangeOfString:@"install"].location != NSNotFound;
-    }];
-    [[[serverInterfaceMock expect]
-        andDo:openOrInstallInvocation]
-            postRequest:[OCMArg any]
-            url:openOrInstallUrlCheckBlock
-            key:[OCMArg any]
-            callback:openOrInstallCallbackCheckBlock];
-
-    preferenceHelper.universalLinkUrl = nil;
-    preferenceHelper.externalIntentURI = nil;
-    preferenceHelper.referringURL = nil;
-
-    [branch clearNetworkQueue];
-    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-    [branch initSessionWithLaunchOptions:@{}
-        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-            // Callback block. Order: 2.
-            XCTAssertNil(error);
-            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
-            XCTAssertTrue(self.notificationOrder == 2);
-            self.notificationOrder++;
-            self.deepLinkParams = params;
-            [openExpectation fulfill];
-        }
-    ];
-
-    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-    XCTAssertTrue(self.notificationOrder == 5);
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    branch.delegate = nil;
-}
-
-// Test that Branch notifications work with a failure.
-// Test that they 1) work and 2) are sent in the right order.
-- (void) testNotificationsFailure {
-
-    self.expectFailure = YES;
-    self.notificationOrder = 0;
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchWillStartSessionNotification:)
-        name:BranchWillStartSessionNotification
-        object:nil];
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-        selector:@selector(branchDidStartSessionNotification:)
-        name:BranchDidStartSessionNotification
-        object:nil];
-
-    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
-
-    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
-    Branch.branchKey = @"key_live_foo";
-
-    Branch *branch =
-        [[Branch alloc]
-            initWithInterface:serverInterfaceMock
-            queue:[[BNCServerRequestQueue alloc] init]
-            cache:[[BNCLinkCache alloc] init]
-            preferenceHelper:preferenceHelper
-            key:@"key_live_foo"];
-    branch.delegate = self;
-
-    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
-    openInstallResponse.data = @{ };
-
-    __block BNCServerCallback openOrInstallCallback;
-    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
-        openOrInstallCallback = callback;
-        return YES;
-    }];
-
-    id openOrInstallInvocation = ^(NSInvocation *invocation) {
-        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
-        openOrInstallCallback(openInstallResponse, error);
-    };
-
-    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
-        return [url rangeOfString:@"open"].location != NSNotFound ||
-               [url rangeOfString:@"install"].location != NSNotFound;
-    }];
-
-    [[[serverInterfaceMock expect]
-        andDo:openOrInstallInvocation]
-        postRequest:[OCMArg any]
-        url:openOrInstallUrlCheckBlock
-        key:[OCMArg any]
-        callback:openOrInstallCallbackCheckBlock];
-
-    [branch clearNetworkQueue];
-    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
-    [branch initSessionWithLaunchOptions:@{}
-        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
-            // Callback block. Order: 2.
-            XCTAssertEqualObjects(params, @{});
-            XCTAssertNotNil(error);
-            XCTAssertTrue(self.notificationOrder == 2);
-            self.notificationOrder++;
-            self.deepLinkParams = params;
-            [openExpectation fulfill];
-        }
-    ];
-
-    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
-    XCTAssertTrue(self.notificationOrder == 5);
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    branch.delegate = nil;
-}
+//- (void) testNotificationsSuccess {
+//
+//    self.expectFailure = NO;
+//    self.notificationOrder = 0;
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchWillStartSessionNotification:)
+//        name:BranchWillStartSessionNotification
+//        object:nil];
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchDidStartSessionNotification:)
+//        name:BranchDidStartSessionNotification
+//        object:nil];
+//
+//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+//
+//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+//    Branch.branchKey = @"key_live_foo";
+//
+//    Branch *branch =
+//        [[Branch alloc]
+//            initWithInterface:serverInterfaceMock
+//            queue:[[BNCServerRequestQueue alloc] init]
+//            cache:[[BNCLinkCache alloc] init]
+//            preferenceHelper:preferenceHelper
+//            key:@"key_live_foo"];
+//    branch.delegate = self;
+//
+//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+//    openInstallResponse.data = @{
+//        @"data": @"{\"$og_title\":\"Content Title\",\"$randomized_bundle_token\":\"423237095633725879\",\"~feature\":\"Sharing Feature\",\"$desktop_url\":\"http://branch.io\",\"$canonical_identifier\":\"item/12345\",\"~id\":423243086454504450,\"~campaign\":\"some campaign\",\"+is_first_session\":false,\"~channel\":\"Distribution Channel\",\"$ios_url\":\"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/\",\"$exp_date\":0,\"$currency\":\"$\",\"$publicly_indexable\":1,\"$content_type\":\"some type\",\"~creation_source\":3,\"$amount\":1000,\"$og_description\":\"My Content Description\",\"+click_timestamp\":1506983962,\"$og_image_url\":\"https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\",\"+match_guaranteed\":true,\"+clicked_branch_link\":true,\"deeplink_text\":\"This text was embedded as data in a Branch link with the following characteristics:\\n\\ncanonicalUrl: https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\\n  title: Content Title\\n  contentDescription: My Content Description\\n  imageUrl: https://pbs.twimg.com/profile_images/658759610220703744/IO1HUADP.png\\n\",\"$one_time_use\":false,\"$canonical_url\":\"https://dev.branch.io/getting-started/deep-link-routing/guide/ios/\",\"~referring_link\":\"https://bnctestbed.app.link/izPBY2xCqF\"}",
+//        @"randomized_device_token": @"439892172783867901",
+//        @"randomized_bundle_token": @"439892172804841307",
+//        @"link": @"https://bnctestbed.app.link?%24randomized_bundle_token=439892172804841307",
+//        @"session_id": @"443529761084512316",
+//    };
+//
+//    __block BNCServerCallback openOrInstallCallback;
+//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+//        openOrInstallCallback = callback;
+//        return YES;
+//    }];
+//
+//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+//        openOrInstallCallback(openInstallResponse, nil);
+//    };
+//
+//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+//        return [url rangeOfString:@"open"].location != NSNotFound ||
+//               [url rangeOfString:@"install"].location != NSNotFound;
+//    }];
+//    [[[serverInterfaceMock expect]
+//        andDo:openOrInstallInvocation]
+//            postRequest:[OCMArg any]
+//            url:openOrInstallUrlCheckBlock
+//            key:[OCMArg any]
+//            callback:openOrInstallCallbackCheckBlock];
+//
+//    preferenceHelper.universalLinkUrl = nil;
+//    preferenceHelper.externalIntentURI = nil;
+//    preferenceHelper.referringURL = nil;
+//
+//    [branch clearNetworkQueue];
+//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+//    [branch initSessionWithLaunchOptions:@{}
+//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+//            // Callback block. Order: 2.
+//            XCTAssertNil(error);
+//            XCTAssertEqualObjects(preferenceHelper.sessionID, @"443529761084512316");
+//            XCTAssertTrue(self.notificationOrder == 2);
+//            self.notificationOrder++;
+//            self.deepLinkParams = params;
+//            [openExpectation fulfill];
+//        }
+//    ];
+//
+//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+//    XCTAssertTrue(self.notificationOrder == 5);
+//    [[NSNotificationCenter defaultCenter] removeObserver:self];
+//    branch.delegate = nil;
+//}
+//
+//// Test that Branch notifications work with a failure.
+//// Test that they 1) work and 2) are sent in the right order.
+//- (void) testNotificationsFailure {
+//
+//    self.expectFailure = YES;
+//    self.notificationOrder = 0;
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchWillStartSessionNotification:)
+//        name:BranchWillStartSessionNotification
+//        object:nil];
+//
+//    [[NSNotificationCenter defaultCenter]
+//        addObserver:self
+//        selector:@selector(branchDidStartSessionNotification:)
+//        name:BranchDidStartSessionNotification
+//        object:nil];
+//
+//    id serverInterfaceMock = OCMClassMock([BNCServerInterface class]);
+//
+//    BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper sharedInstance];
+//    Branch.branchKey = @"key_live_foo";
+//
+//    Branch *branch =
+//        [[Branch alloc]
+//            initWithInterface:serverInterfaceMock
+//            queue:[[BNCServerRequestQueue alloc] init]
+//            cache:[[BNCLinkCache alloc] init]
+//            preferenceHelper:preferenceHelper
+//            key:@"key_live_foo"];
+//    branch.delegate = self;
+//
+//    BNCServerResponse *openInstallResponse = [[BNCServerResponse alloc] init];
+//    openInstallResponse.data = @{ };
+//
+//    __block BNCServerCallback openOrInstallCallback;
+//    id openOrInstallCallbackCheckBlock = [OCMArg checkWithBlock:^BOOL(BNCServerCallback callback) {
+//        openOrInstallCallback = callback;
+//        return YES;
+//    }];
+//
+//    id openOrInstallInvocation = ^(NSInvocation *invocation) {
+//        NSError *error = [NSError branchErrorWithCode:BNCNetworkServiceInterfaceError];
+//        openOrInstallCallback(openInstallResponse, error);
+//    };
+//
+//    id openOrInstallUrlCheckBlock = [OCMArg checkWithBlock:^BOOL(NSString *url) {
+//        return [url rangeOfString:@"open"].location != NSNotFound ||
+//               [url rangeOfString:@"install"].location != NSNotFound;
+//    }];
+//
+//    [[[serverInterfaceMock expect]
+//        andDo:openOrInstallInvocation]
+//        postRequest:[OCMArg any]
+//        url:openOrInstallUrlCheckBlock
+//        key:[OCMArg any]
+//        callback:openOrInstallCallbackCheckBlock];
+//
+//    [branch clearNetworkQueue];
+//    XCTestExpectation *openExpectation = [self expectationWithDescription:@"Test open"];
+//    [branch initSessionWithLaunchOptions:@{}
+//        andRegisterDeepLinkHandler:^(NSDictionary *params, NSError *error) {
+//            // Callback block. Order: 2.
+//            XCTAssertEqualObjects(params, @{});
+//            XCTAssertNotNil(error);
+//            XCTAssertTrue(self.notificationOrder == 2);
+//            self.notificationOrder++;
+//            self.deepLinkParams = params;
+//            [openExpectation fulfill];
+//        }
+//    ];
+//
+//    [self waitForExpectationsWithTimeout:5.0 handler:NULL];
+//    XCTAssertTrue(self.notificationOrder == 5);
+//    [[NSNotificationCenter defaultCenter] removeObserver:self];
+//    branch.delegate = nil;
+//}
 
 #pragma mark - Delegate & Notification Methods
 

From 11813164660e68d88ec8c0ad7279672d842e40d2 Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 17:09:59 -0700
Subject: [PATCH 17/18] Remove test

---
 Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
index ff6214c3d..e695e5afb 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BranchClassTests.m
@@ -44,10 +44,10 @@ - (void)testSetNetworkTimeout {
     XCTAssertEqual([BNCPreferenceHelper sharedInstance].timeout, 5.0, @"Network timeout should be set to 5.0");
 }
 
-- (void)testSetMaxRetries {
-    [self.branch setMaxRetries:3];
-    XCTAssertEqual([BNCPreferenceHelper sharedInstance].retryCount, 3, @"Max retries should be set to 3");
-}
+//- (void)testSetMaxRetries {
+//    [self.branch setMaxRetries:3];
+//    XCTAssertEqual([BNCPreferenceHelper sharedInstance].retryCount, 3, @"Max retries should be set to 3");
+//}
 
 - (void)testSetRetryInterval {
     [self.branch setRetryInterval:2.0];

From dae58dfbc7dbfc7629b6b60aff25255b6c2e521f Mon Sep 17 00:00:00 2001
From: nsingh-branch <nipun.singh@branch.io>
Date: Mon, 23 Oct 2023 17:43:16 -0700
Subject: [PATCH 18/18] Update BNCServerInterface.Test.m

---
 .../BNCServerInterface.Test.m                 | 112 +++++++++---------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCServerInterface.Test.m b/Branch-TestBed/Branch-SDK-Tests/BNCServerInterface.Test.m
index c2b220f93..cdd4401c7 100644
--- a/Branch-TestBed/Branch-SDK-Tests/BNCServerInterface.Test.m
+++ b/Branch-TestBed/Branch-SDK-Tests/BNCServerInterface.Test.m
@@ -85,62 +85,62 @@ - (void)testParamAddForBranchKey {
 // This test simulates a poor network, with three failed GET attempts and one final success,
 // for 4 connections.
 
-- (void)testGetRequestAsyncRetriesWhenAppropriate {
-  [HTTPStubs removeAllStubs];
-
-  //Set up nsurlsession and data task, catching response
-  BNCServerInterface *serverInterface = [[BNCServerInterface alloc] init];
-  serverInterface.preferenceHelper = [[BNCPreferenceHelper alloc] init];
-  serverInterface.preferenceHelper.retryCount = 3;
-
-  XCTestExpectation* successExpectation = [self expectationWithDescription:@"success"];
-  
-  __block NSInteger connectionAttempts = 0;
-  __block NSInteger failedConnections = 0;
-  __block NSInteger successfulConnections = 0;
-  
-  [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-    BOOL foundBranchKey = [request.URL.query rangeOfString:@"branch_key=key_"].location != NSNotFound;
-    XCTAssertEqual(foundBranchKey, TRUE);
-    return foundBranchKey;
-    
-  } withStubResponse:^HTTPStubsResponse*(NSURLRequest *request) {
-    @synchronized (self) {
-        connectionAttempts++;
-        NSLog(@"Attempt # %lu", (unsigned long)connectionAttempts);
-        if (connectionAttempts < 3) {
-
-          // Return an error the first three times
-          NSDictionary* dummyJSONResponse = @{@"bad": @"data"};
-          
-          ++failedConnections;
-          return [HTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:504 headers:nil];
-          
-        } else if (connectionAttempts == 3) {
-
-          // Return actual data afterwards
-          ++successfulConnections;
-          XCTAssertEqual(connectionAttempts, failedConnections + successfulConnections);
-          BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
-            NSLog(@"==> Fullfill.");
-            [successExpectation fulfill];
-          });
-
-          NSDictionary* dummyJSONResponse = @{@"key": @"value"};
-          return [HTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
-
-        } else {
-
-            XCTFail(@"Too many connection attempts: %ld.", (long) connectionAttempts);
-            return [HTTPStubsResponse responseWithJSONObject:[NSDictionary new] statusCode:200 headers:nil];
-
-        }
-    }
-  }];
-  
-  [serverInterface getRequest:nil url:@"http://foo" key:@"key_live_foo" callback:NULL];
-  [self waitForExpectationsWithTimeout:10.0 handler:nil];
-}
+//- (void)testGetRequestAsyncRetriesWhenAppropriate {
+//  [HTTPStubs removeAllStubs];
+//
+//  //Set up nsurlsession and data task, catching response
+//  BNCServerInterface *serverInterface = [[BNCServerInterface alloc] init];
+//  serverInterface.preferenceHelper = [[BNCPreferenceHelper alloc] init];
+//  serverInterface.preferenceHelper.retryCount = 3;
+//
+//  XCTestExpectation* successExpectation = [self expectationWithDescription:@"success"];
+//  
+//  __block NSInteger connectionAttempts = 0;
+//  __block NSInteger failedConnections = 0;
+//  __block NSInteger successfulConnections = 0;
+//  
+//  [HTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+//    BOOL foundBranchKey = [request.URL.query rangeOfString:@"branch_key=key_"].location != NSNotFound;
+//    XCTAssertEqual(foundBranchKey, TRUE);
+//    return foundBranchKey;
+//    
+//  } withStubResponse:^HTTPStubsResponse*(NSURLRequest *request) {
+//    @synchronized (self) {
+//        connectionAttempts++;
+//        NSLog(@"Attempt # %lu", (unsigned long)connectionAttempts);
+//        if (connectionAttempts < 3) {
+//
+//          // Return an error the first three times
+//          NSDictionary* dummyJSONResponse = @{@"bad": @"data"};
+//          
+//          ++failedConnections;
+//          return [HTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:504 headers:nil];
+//          
+//        } else if (connectionAttempts == 3) {
+//
+//          // Return actual data afterwards
+//          ++successfulConnections;
+//          XCTAssertEqual(connectionAttempts, failedConnections + successfulConnections);
+//          BNCAfterSecondsPerformBlockOnMainThread(0.01, ^{
+//            NSLog(@"==> Fullfill.");
+//            [successExpectation fulfill];
+//          });
+//
+//          NSDictionary* dummyJSONResponse = @{@"key": @"value"};
+//          return [HTTPStubsResponse responseWithJSONObject:dummyJSONResponse statusCode:200 headers:nil];
+//
+//        } else {
+//
+//            XCTFail(@"Too many connection attempts: %ld.", (long) connectionAttempts);
+//            return [HTTPStubsResponse responseWithJSONObject:[NSDictionary new] statusCode:200 headers:nil];
+//
+//        }
+//    }
+//  }];
+//  
+//  [serverInterface getRequest:nil url:@"http://foo" key:@"key_live_foo" callback:NULL];
+//  [self waitForExpectationsWithTimeout:10.0 handler:nil];
+//}
 
 //==================================================================================
 // TEST 04