diff --git a/CoreLocation/CoreLocation.xcodeproj/project.pbxproj b/CoreLocation/CoreLocation.xcodeproj/project.pbxproj
index fdd3205..7c8aa0b 100644
--- a/CoreLocation/CoreLocation.xcodeproj/project.pbxproj
+++ b/CoreLocation/CoreLocation.xcodeproj/project.pbxproj
@@ -462,7 +462,7 @@
 				AEEECC4A181F36B2006B52CD /* Cedar-iOS SpecBundle.xctest */,
 				AE52000A1BCB323C006BA693 /* Cedar-watchOS Specs.app */,
 				AE52000C1BCB323C006BA693 /* Cedar-watchOS Specs Extension.appex */,
-				AE52000E1BCB323C006BA693 /* Cedar-tvOS SpecBundle.bundle */,
+				AE52000E1BCB323C006BA693 /* Cedar-tvOS SpecBundle.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -750,7 +750,7 @@
 		AE3848CC168CD86000C99B55 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Pivotal Labs";
 				TargetAttributes = {
 					3466C06A1B97A2ED00CBAB59 = {
@@ -898,10 +898,10 @@
 			remoteRef = AE52000B1BCB323C006BA693 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		AE52000E1BCB323C006BA693 /* Cedar-tvOS SpecBundle.bundle */ = {
+		AE52000E1BCB323C006BA693 /* Cedar-tvOS SpecBundle.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "Cedar-tvOS SpecBundle.bundle";
+			path = "Cedar-tvOS SpecBundle.xctest";
 			remoteRef = AE52000D1BCB323C006BA693 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1156,6 +1156,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1194,6 +1195,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -1233,6 +1235,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1270,6 +1273,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -1362,12 +1366,22 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1375,11 +1389,13 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1392,17 +1408,28 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1416,7 +1443,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				HEADER_SEARCH_PATHS = "$SRCROOT/../Externals/Cedar/**";
 				INFOPLIST_FILE = "../InfoPlist/SpecHost-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.${PRODUCT_NAME:rfc1034identifier}";
@@ -1431,7 +1458,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				HEADER_SEARCH_PATHS = "$SRCROOT/../Externals/Cedar/**";
 				INFOPLIST_FILE = "../InfoPlist/SpecHost-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.${PRODUCT_NAME:rfc1034identifier}";
@@ -1523,7 +1550,7 @@
 			buildSettings = {
 				DSTROOT = /tmp/CoreLocation_PivotalSpecHelper_StaticLib.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1535,7 +1562,7 @@
 			buildSettings = {
 				DSTROOT = /tmp/CoreLocation_PivotalSpecHelper_StaticLib.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1553,6 +1580,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1589,6 +1617,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme
index bf696e0..43e3993 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme	
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-StaticLib.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-StaticLib.xcscheme
index 2ce5257..50d2810 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-StaticLib.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-iOS.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-iOS.xcscheme
index 3d4d56e..6ef5a6c 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-iOS.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-tvOS.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-tvOS.xcscheme
index 77250cb..6f4d81c 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-tvOS.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-watchOS.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-watchOS.xcscheme
index b2f1e2a..f6dab6f 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-watchOS.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme
index 5b7afc6..43e3993 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation+PivotalSpecHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation-StaticLibSpec.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation-StaticLibSpec.xcscheme
index 7d90aff..11ad730 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation-StaticLibSpec.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocation-StaticLibSpec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocationSpec.xcscheme b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocationSpec.xcscheme
index 5e474a9..30dd776 100644
--- a/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocationSpec.xcscheme
+++ b/CoreLocation/CoreLocation.xcodeproj/xcshareddata/xcschemes/CoreLocationSpec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/project.pbxproj b/Foundation/Foundation.xcodeproj/project.pbxproj
index fa270ef..7bc43a7 100644
--- a/Foundation/Foundation.xcodeproj/project.pbxproj
+++ b/Foundation/Foundation.xcodeproj/project.pbxproj
@@ -1391,7 +1391,7 @@
 				AEEECC3D181F368F006B52CD /* Cedar-iOS SpecBundle.xctest */,
 				34A663B91BDF24E800EF0FEA /* Cedar-watchOS Specs.app */,
 				34A663BB1BDF24E800EF0FEA /* Cedar-watchOS Specs Extension.appex */,
-				34A663BD1BDF24E800EF0FEA /* Cedar-tvOS SpecBundle.bundle */,
+				34A663BD1BDF24E800EF0FEA /* Cedar-tvOS SpecBundle.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1905,7 +1905,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastTestingUpgradeCheck = 0610;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0820;
 				TargetAttributes = {
 					3466C03A1B97A10A00CBAB59 = {
 						CreatedOnToolsVersion = 7.0;
@@ -2048,10 +2048,10 @@
 			remoteRef = 34A663BA1BDF24E800EF0FEA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		34A663BD1BDF24E800EF0FEA /* Cedar-tvOS SpecBundle.bundle */ = {
+		34A663BD1BDF24E800EF0FEA /* Cedar-tvOS SpecBundle.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "Cedar-tvOS SpecBundle.bundle";
+			path = "Cedar-tvOS SpecBundle.xctest";
 			remoteRef = 34A663BC1BDF24E800EF0FEA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -2677,16 +2677,20 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -2709,13 +2713,16 @@
 		1DEB922408733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2760,7 +2767,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../Externals/Cedar/Source/Headers\"/**";
 				INFOPLIST_FILE = "../InfoPlist/SpecBundle-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.PivotalCoreKit.Foundation-StaticLibSpecBundle";
@@ -2789,7 +2796,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/../Externals/Cedar/Source/Headers\"/**";
 				INFOPLIST_FILE = "../InfoPlist/SpecBundle-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pivotallabs.PivotalCoreKit.Foundation-StaticLibSpecBundle";
@@ -2809,6 +2816,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2849,6 +2857,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2885,6 +2894,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2923,6 +2933,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2959,6 +2970,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2997,6 +3009,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3031,6 +3044,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3068,6 +3082,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3186,7 +3201,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3228,7 +3243,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -3334,7 +3349,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3375,7 +3390,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -3585,7 +3600,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -3607,7 +3622,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -3635,7 +3650,7 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -3656,7 +3671,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3692,7 +3707,7 @@
 					"\"$(PROJECT_DIR)/../Externals/FakeHTTP/FakeHTTP\"/**",
 				);
 				INFOPLIST_FILE = "../InfoPlist/SpecHost-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-all_load",
@@ -3724,7 +3739,7 @@
 					"\"$(PROJECT_DIR)/../Externals/FakeHTTP/FakeHTTP\"/**",
 				);
 				INFOPLIST_FILE = "../InfoPlist/SpecHost-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = (
 					"-ObjC",
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme
index 11a725d..dda6e5b 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme	
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-StaticLib.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-StaticLib.xcscheme
index 5d89022..712eaf5 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-StaticLib.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS 2.xcscheme
index 8c478f1..e228f4a 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS 2.xcscheme	
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS.xcscheme
index 353c1d4..1a59023 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-tvOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-tvOS.xcscheme
index 9f34dff..e1f1400 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-tvOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-watchOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-watchOS.xcscheme
index 0118e5c..5a4209c 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-watchOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme
index 4f1dc10..dda6e5b 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme
index f7b18c8..bafa4e2 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme	
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-StaticLib.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-StaticLib.xcscheme
index c082a29..d1c0e4c 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-StaticLib.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS 2.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS 2.xcscheme
index aaa7951..c4a46fd 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS 2.xcscheme	
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS.xcscheme
index 400a6f8..9827f0b 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-tvOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-tvOS.xcscheme
index d1bd781..9487b7b 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-tvOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-watchOS.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-watchOS.xcscheme
index 816a002..7cfb702 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-watchOS.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme
index 12bd4ed..bafa4e2 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation+PivotalSpecHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation-StaticLibSpec.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation-StaticLibSpec.xcscheme
index 180e91f..1fc69d6 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation-StaticLibSpec.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/Foundation-StaticLibSpec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/FoundationSpec.xcscheme b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/FoundationSpec.xcscheme
index 49708c5..b53dbd5 100644
--- a/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/FoundationSpec.xcscheme
+++ b/Foundation/Foundation.xcodeproj/xcshareddata/xcschemes/FoundationSpec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/project.pbxproj b/UIKit/UIKit.xcodeproj/project.pbxproj
index 07e9995..a84d14c 100644
--- a/UIKit/UIKit.xcodeproj/project.pbxproj
+++ b/UIKit/UIKit.xcodeproj/project.pbxproj
@@ -1282,7 +1282,7 @@
 				AEEECC31181F33C5006B52CD /* Cedar-iOS SpecBundle.xctest */,
 				3431FD011BE302B400740FFB /* Cedar-watchOS Specs.app */,
 				3431FD031BE302B400740FFB /* Cedar-watchOS Specs Extension.appex */,
-				3431FD051BE302B400740FFB /* Cedar-tvOS SpecBundle.bundle */,
+				3431FD051BE302B400740FFB /* Cedar-tvOS SpecBundle.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1792,7 +1792,7 @@
 		AEBCCBA7168B95A00056EE83 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Pivotal Labs";
 				TargetAttributes = {
 					3466C0931B97A3C500CBAB59 = {
@@ -1922,10 +1922,10 @@
 			remoteRef = 3431FD021BE302B400740FFB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3431FD051BE302B400740FFB /* Cedar-tvOS SpecBundle.bundle */ = {
+		3431FD051BE302B400740FFB /* Cedar-tvOS SpecBundle.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "Cedar-tvOS SpecBundle.bundle";
+			path = "Cedar-tvOS SpecBundle.xctest";
 			remoteRef = 3431FD041BE302B400740FFB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -2701,6 +2701,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2740,6 +2741,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2782,6 +2784,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2821,6 +2824,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -2864,6 +2868,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2904,6 +2909,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3069,6 +3075,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3107,6 +3114,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3149,6 +3157,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3188,6 +3197,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3230,6 +3240,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -3269,6 +3280,7 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -3371,13 +3383,23 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -3389,8 +3411,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -3404,20 +3427,30 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "armv7 armv7s i386 arm64 x86_64";
@@ -3658,6 +3691,7 @@
 				AE0D6A5B1BE93CAD0095ACF3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		AE0D6A761BE941290095ACF3 /* Build configuration list for PBXNativeTarget "UIKit+PivotalSpecHelper-iOS" */ = {
 			isa = XCConfigurationList;
@@ -3666,6 +3700,7 @@
 				AE0D6A781BE941290095ACF3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		AE0D6A9E1BE942490095ACF3 /* Build configuration list for PBXNativeTarget "UIKit+PivotalSpecHelperStubs-iOS" */ = {
 			isa = XCConfigurationList;
@@ -3674,6 +3709,7 @@
 				AE0D6AA01BE942490095ACF3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		AE3F05C81BE81FDD002BA0DE /* Build configuration list for PBXNativeTarget "UIKit+PivotalCore-iOS" */ = {
 			isa = XCConfigurationList;
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-StaticLib.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-StaticLib.xcscheme
index 8b3a2eb..809106e 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-StaticLib.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-iOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-iOS.xcscheme
index 00c0ebe..6cc7448 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-iOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-tvOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-tvOS.xcscheme
index f4c3432..8924867 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-tvOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalCore-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-StaticLib.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-StaticLib.xcscheme
index 0e22a60..1bc3225 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-StaticLib.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS 2.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS 2.xcscheme
index 3184652..c5c6d3c 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS 2.xcscheme	
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS.xcscheme
index 83f581d..d17c8cf 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-tvOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-tvOS.xcscheme
index 0239667..00e4d2f 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-tvOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelper-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-StaticLib.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-StaticLib.xcscheme
index 793593c..5e80179 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-StaticLib.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS 2.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS 2.xcscheme
index 840c12a..0424e0e 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS 2.xcscheme	
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS 2.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS.xcscheme
index 294807e..bb60212 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-tvOS.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-tvOS.xcscheme
index c05e5d8..9e38b62 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-tvOS.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit+PivotalSpecHelperStubs-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-StaticLibSpec.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-StaticLibSpec.xcscheme
index 6614856..e05bfc3 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-StaticLibSpec.xcscheme
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-StaticLibSpec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-iOS SpecHost.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-iOS SpecHost.xcscheme
index 1f57134..90b6211 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-iOS SpecHost.xcscheme	
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-iOS SpecHost.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-tvOS SpecHost.xcscheme b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-tvOS SpecHost.xcscheme
index 69fadfc..5986a5d 100644
--- a/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-tvOS SpecHost.xcscheme	
+++ b/UIKit/UIKit.xcodeproj/xcshareddata/xcschemes/UIKit-tvOS SpecHost.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Glance - SpecBuildHelper.xcscheme b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Glance - SpecBuildHelper.xcscheme
index 060aedb..00a5fb1 100644
--- a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Glance - SpecBuildHelper.xcscheme	
+++ b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Glance - SpecBuildHelper.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0820"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Notification - SpecBuildHelper.xcscheme b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Notification - SpecBuildHelper.xcscheme
index 51bf3b5..00f047b 100644
--- a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Notification - SpecBuildHelper.xcscheme	
+++ b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/Notification - SpecBuildHelper.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0820"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/SpecBuildHelper.xcscheme b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/SpecBuildHelper.xcscheme
index 9c2985e..dff9328 100644
--- a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/SpecBuildHelper.xcscheme
+++ b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/SpecBuildHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/WatchKit.xcscheme b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/WatchKit.xcscheme
index f51e4a8..8132eef 100644
--- a/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/WatchKit.xcscheme
+++ b/WatchKit/WatchKit.xcodeproj/xcshareddata/xcschemes/WatchKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"