diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
index 9a5fbd114..1ed4b7991 100644
--- a/Bolts.xcodeproj/project.pbxproj
+++ b/Bolts.xcodeproj/project.pbxproj
@@ -45,6 +45,9 @@
 		8178F9961BB0F87700AD289D /* BoltsVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8103FA5619900A84000BAE3F /* BoltsVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8178F9971BB0F87700AD289D /* Bolts.h in Headers */ = {isa = PBXBuildFile; fileRef = 8103FA5419900A84000BAE3F /* Bolts.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8178F9981BB0F87700AD289D /* BFCancellationToken.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C60AEBD1ACF08F300747DD7 /* BFCancellationToken.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		818ADC6A1BE1A7FB00C8006C /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AFCA021BA752750076E927 /* Bolts.framework */; };
+		818ADC6B1BE1A80300C8006C /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ED946E1BE14B5200795F05 /* Bolts.framework */; };
+		818ADC6C1BE1A80F00C8006C /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ED94291BE147CF00795F05 /* Bolts.framework */; };
 		81D0EE7D19AFA8260000AE75 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81D0EE7C19AFA8260000AE75 /* UIKit.framework */; };
 		81D0EE8219AFAA060000AE75 /* BoltsVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8103FA5619900A84000BAE3F /* BoltsVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81D0EE8319AFAA0E0000AE75 /* Bolts.h in Headers */ = {isa = PBXBuildFile; fileRef = 8103FA5419900A84000BAE3F /* Bolts.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -91,13 +94,9 @@
 		81ED943D1BE1481900795F05 /* BFURL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = B242FABA19A567660097ECAE /* BFURL_Internal.h */; };
 		81ED943E1BE1481900795F05 /* BFURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 8103FA6419900A84000BAE3F /* BFURL.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81ED943F1BE1481900795F05 /* BFURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 8103FA6519900A84000BAE3F /* BFURL.m */; };
-		81ED946F1BE14B6000795F05 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ED94291BE147CF00795F05 /* Bolts.framework */; };
 		85D5138A18E4E45800D19D87 /* AppLinkReturnToRefererViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 85D5138918E4E45800D19D87 /* AppLinkReturnToRefererViewTests.m */; };
 		8E17EC271805D0A40049E862 /* BoltsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6BF681805CF5600337041 /* BoltsTests.m */; };
-		8E8C8EEA17F23D1D00E3F1C7 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E8C8ED217F23C3B00E3F1C7 /* XCTest.framework */; };
-		8E8C8EEB17F23D1D00E3F1C7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9C3CEC17DE9DE000427E62 /* Foundation.framework */; };
 		8E8C8EFB17F23E5F00E3F1C7 /* TaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9C3D1C17DE9F6500427E62 /* TaskTests.m */; };
-		8E8C8F1A17F241DA00E3F1C7 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E8C8ED217F23C3B00E3F1C7 /* XCTest.framework */; };
 		8E8C8F2917F241FF00E3F1C7 /* TaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9C3D1C17DE9F6500427E62 /* TaskTests.m */; };
 		8EA6BF691805CF5600337041 /* BoltsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6BF681805CF5600337041 /* BoltsTests.m */; };
 		8EDDA63017E17DDC00655F8A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9C3CEC17DE9DE000427E62 /* Foundation.framework */; };
@@ -122,7 +121,6 @@
 		F5AFCA091BA752770076E927 /* BoltsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA6BF681805CF5600337041 /* BoltsTests.m */; };
 		F5AFCA0A1BA752770076E927 /* TaskTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9C3D1C17DE9F6500427E62 /* TaskTests.m */; };
 		F5AFCA0B1BA752770076E927 /* CancellationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C60AEC51ACF19F900747DD7 /* CancellationTests.m */; };
-		F5AFCA0E1BA752770076E927 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E8C8ED217F23C3B00E3F1C7 /* XCTest.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -133,14 +131,21 @@
 			remoteGlobalIDString = 1EC3015F18CDAA8300D06D07;
 			remoteInfo = BoltsTestUI;
 		};
-		8E8C8F2417F241DA00E3F1C7 /* PBXContainerItemProxy */ = {
+		818ADC681BE1A7F000C8006C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 8E9C3CE117DE9DE000427E62 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 8EDDA62817E17DDC00655F8A;
-			remoteInfo = MacBolts;
+			remoteGlobalIDString = F5AFC9EA1BA752750076E927;
+			remoteInfo = "Bolts-tvOS";
+		};
+		818ADC6D1BE1A81900C8006C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 8E9C3CE117DE9DE000427E62 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 81ED94111BE147CF00795F05;
+			remoteInfo = "Bolts-iOS";
 		};
-		F5AFCA061BA752770076E927 /* PBXContainerItemProxy */ = {
+		8E8C8F2417F241DA00E3F1C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 8E9C3CE117DE9DE000427E62 /* Project object */;
 			proxyType = 1;
@@ -273,9 +278,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				81ED946F1BE14B6000795F05 /* Bolts.framework in Frameworks */,
-				8E8C8EEA17F23D1D00E3F1C7 /* XCTest.framework in Frameworks */,
-				8E8C8EEB17F23D1D00E3F1C7 /* Foundation.framework in Frameworks */,
+				818ADC6C1BE1A80F00C8006C /* Bolts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -283,7 +286,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8E8C8F1A17F241DA00E3F1C7 /* XCTest.framework in Frameworks */,
+				818ADC6B1BE1A80300C8006C /* Bolts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -307,7 +310,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F5AFCA0E1BA752770076E927 /* XCTest.framework in Frameworks */,
+				818ADC6A1BE1A7FB00C8006C /* Bolts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -677,6 +680,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				818ADC6E1BE1A81900C8006C /* PBXTargetDependency */,
 				1E617A8A18DA0CA90056A4E2 /* PBXTargetDependency */,
 			);
 			name = "BoltsTests-iOS";
@@ -747,7 +751,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				F5AFCA051BA752770076E927 /* PBXTargetDependency */,
+				818ADC691BE1A7F000C8006C /* PBXTargetDependency */,
 			);
 			name = "BoltsTests-tvOS";
 			productName = MacBoltsTests;
@@ -943,15 +947,20 @@
 			target = 1EC3015F18CDAA8300D06D07 /* BoltsTestUI */;
 			targetProxy = 1E617A8918DA0CA90056A4E2 /* PBXContainerItemProxy */;
 		};
-		8E8C8F2517F241DA00E3F1C7 /* PBXTargetDependency */ = {
+		818ADC691BE1A7F000C8006C /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 8EDDA62817E17DDC00655F8A /* Bolts-OSX */;
-			targetProxy = 8E8C8F2417F241DA00E3F1C7 /* PBXContainerItemProxy */;
+			target = F5AFC9EA1BA752750076E927 /* Bolts-tvOS */;
+			targetProxy = 818ADC681BE1A7F000C8006C /* PBXContainerItemProxy */;
 		};
-		F5AFCA051BA752770076E927 /* PBXTargetDependency */ = {
+		818ADC6E1BE1A81900C8006C /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 81ED94111BE147CF00795F05 /* Bolts-iOS */;
+			targetProxy = 818ADC6D1BE1A81900C8006C /* PBXContainerItemProxy */;
+		};
+		8E8C8F2517F241DA00E3F1C7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 8EDDA62817E17DDC00655F8A /* Bolts-OSX */;
-			targetProxy = F5AFCA061BA752770076E927 /* PBXContainerItemProxy */;
+			targetProxy = 8E8C8F2417F241DA00E3F1C7 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme
index 91c54948a..c22e39876 100644
--- a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme
+++ b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-OSX.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Bolts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8E8C8F1817F241DA00E3F1C7"
+               BuildableName = "BoltsTests-OSX.xctest"
+               BlueprintName = "BoltsTests-OSX"
+               ReferencedContainer = "container:Bolts.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -40,6 +54,15 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8EDDA62817E17DDC00655F8A"
+            BuildableName = "Bolts.framework"
+            BlueprintName = "Bolts-OSX"
+            ReferencedContainer = "container:Bolts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -71,6 +94,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8EDDA62817E17DDC00655F8A"
+            BuildableName = "Bolts.framework"
+            BlueprintName = "Bolts-OSX"
+            ReferencedContainer = "container:Bolts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme
index ebcba8589..15c42b6b3 100644
--- a/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme
+++ b/Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-tvOS.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Bolts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F5AFCA041BA752770076E927"
+               BuildableName = "BoltsTests-tvOS.xctest"
+               BlueprintName = "BoltsTests-tvOS"
+               ReferencedContainer = "container:Bolts.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction