diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index 3f866b3..e357f24 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -547,7 +547,7 @@
 			buildConfigurationList = F4222DED6042BF8400000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
 			buildPhases = (
 				978262AB0C8B8F3600000000 /* ShellScript */,
-				978262AB4617F10200000000 /* ShellScript */,
+				978262AB87E2752000000000 /* ShellScript */,
 				04BFD5160000000000000000 /* Sources */,
 			);
 			buildRules = (
@@ -685,20 +685,6 @@
 			shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose ";
 			showEnvVarsInLog = 1;
 		};
-		978262AB4617F10200000000 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 0;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/bash;
-			shellScript = "# Script to generate dependency files Xcode expects when running tests.\nset -eu\nARCH_ARRAY=($ARCHS)\nFILES=(defaultTestSource SrcsHeader src5 src1 src2 src3 src4)\nfor ARCH in \"${ARCH_ARRAY[@]}\"\ndo\n  mkdir -p \"$OBJECT_FILE_DIR_normal/$ARCH/\"\n  rm -f \"$OBJECT_FILE_DIR_normal/$ARCH/${PRODUCT_NAME}_dependency_info.dat\"\n  printf '\\x00\\x31\\x00' >\"$OBJECT_FILE_DIR_normal/$ARCH/${PRODUCT_NAME}_dependency_info.dat\"\n  for FILE in \"${FILES[@]}\"\n  do\n    touch \"$OBJECT_FILE_DIR_normal/$ARCH/$FILE.d\"\n  done\ndone";
-			showEnvVarsInLog = 1;
-		};
 		978262AB5E42831100000000 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 0;
@@ -714,6 +700,20 @@
 			shellScript = "set -e\ncd \"${SRCROOT}/..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:TodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"bazel-bin\" --verbose ";
 			showEnvVarsInLog = 1;
 		};
+		978262AB87E2752000000000 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 0;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "# Script to generate dependency files Xcode expects when running tests.\nset -eu\nARCH_ARRAY=($ARCHS)\nFILES=(SrcsHeader src5 src1 src2 src3 src4 defaultTestSource)\nfor ARCH in \"${ARCH_ARRAY[@]}\"\ndo\n  mkdir -p \"$OBJECT_FILE_DIR_normal/$ARCH/\"\n  rm -f \"$OBJECT_FILE_DIR_normal/$ARCH/${PRODUCT_NAME}_dependency_info.dat\"\n  printf '\\x00\\x31\\x00' >\"$OBJECT_FILE_DIR_normal/$ARCH/${PRODUCT_NAME}_dependency_info.dat\"\n  for FILE in \"${FILES[@]}\"\n  do\n    touch \"$OBJECT_FILE_DIR_normal/$ARCH/$FILE.d\"\n  done\ndone";
+			showEnvVarsInLog = 1;
+		};
 		978262ABC642309A00000000 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 0;
@@ -736,12 +736,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 0;
 			files = (
-				952C886DF3273A4100000000 /* defaultTestSource.m in srcs */,
 				952C886D3A8E944E00000000 /* src5.mm in srcs */,
 				952C886D160C3D9400000000 /* src1.m in srcs */,
 				952C886DB778F33400000000 /* src2.m in srcs */,
 				952C886D55B4D94500000000 /* src3.m in srcs */,
 				952C886D52C027AF00000000 /* src4.m in srcs */,
+				952C886DF3273A4100000000 /* defaultTestSource.m in srcs */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -908,7 +908,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -933,7 +933,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -999,7 +999,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -1020,7 +1020,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -1037,7 +1037,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -1090,7 +1090,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -1202,7 +1202,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -1219,7 +1219,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -1272,7 +1272,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -1391,7 +1391,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1416,7 +1416,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1482,7 +1482,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index fc2f08f..f6932b9 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -451,7 +451,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -476,7 +476,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -501,7 +501,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -554,7 +554,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -571,7 +571,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -588,7 +588,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -653,7 +653,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -670,7 +670,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -687,7 +687,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -765,7 +765,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -790,7 +790,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -815,7 +815,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index 312b040..0ca7a96 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -562,7 +562,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -587,7 +587,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -614,7 +614,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -681,7 +681,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -701,7 +701,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -718,7 +718,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -737,7 +737,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -791,7 +791,7 @@
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -823,7 +823,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -840,7 +840,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -859,7 +859,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -913,7 +913,7 @@
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -953,7 +953,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -978,7 +978,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1005,7 +1005,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1072,7 +1072,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
index b14191c..d8b6189 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
@@ -323,7 +323,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -348,7 +348,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -373,7 +373,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -426,7 +426,7 @@
 				PRODUCT_NAME = ApplicationOne;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -443,7 +443,7 @@
 				PRODUCT_NAME = ApplicationTwo;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -460,7 +460,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -513,7 +513,7 @@
 				PRODUCT_NAME = ApplicationOne;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -530,7 +530,7 @@
 				PRODUCT_NAME = ApplicationTwo;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -547,7 +547,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -613,7 +613,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -638,7 +638,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -663,7 +663,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index 8b3572e..4f32ecb 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -290,7 +290,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -353,7 +353,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -416,7 +416,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -481,7 +481,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index 4afae96..1da3e75 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -554,7 +554,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -579,7 +579,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -645,7 +645,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -665,7 +665,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -682,7 +682,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -735,7 +735,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -795,7 +795,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -812,7 +812,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -865,7 +865,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -933,7 +933,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -958,7 +958,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1024,7 +1024,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
index 47d17e1..7fc76b5 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
@@ -344,7 +344,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -369,7 +369,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -435,7 +435,7 @@
 				PRODUCT_NAME = tvOSApplication;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
@@ -452,7 +452,7 @@
 				PRODUCT_NAME = tvOSExtension;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
@@ -518,7 +518,7 @@
 				PRODUCT_NAME = tvOSApplication;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
@@ -535,7 +535,7 @@
 				PRODUCT_NAME = tvOSExtension;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
@@ -601,7 +601,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -626,7 +626,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Debug;
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 2f70451..079b369 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -396,7 +396,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -450,7 +450,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -541,7 +541,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -645,7 +645,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index 7d1334e..c6339b6 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -591,7 +591,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -616,7 +616,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -644,7 +644,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -672,7 +672,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -739,7 +739,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -759,7 +759,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -776,7 +776,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -796,7 +796,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -816,7 +816,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -870,7 +870,7 @@
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -902,7 +902,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -919,7 +919,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -939,7 +939,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -959,7 +959,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -1013,7 +1013,7 @@
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -1053,7 +1053,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1078,7 +1078,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1106,7 +1106,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1134,7 +1134,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1201,7 +1201,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 670dcee..d5eec51 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -342,7 +342,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -367,7 +367,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -428,7 +428,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -445,7 +445,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -513,7 +513,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -530,7 +530,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -606,7 +606,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -631,7 +631,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index e789da0..7f6022f 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -498,7 +498,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -523,7 +523,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -551,7 +551,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -579,7 +579,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -640,7 +640,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -657,7 +657,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -677,7 +677,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -697,7 +697,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -765,7 +765,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -782,7 +782,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -802,7 +802,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -822,7 +822,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -898,7 +898,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -923,7 +923,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -951,7 +951,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -979,7 +979,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index c0a6be6..217ffd1 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -464,7 +464,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -488,7 +488,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -513,7 +513,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -567,7 +567,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Debug;
 		};
@@ -583,7 +583,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
@@ -600,7 +600,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
@@ -678,7 +678,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = Release;
 		};
@@ -694,7 +694,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
@@ -711,7 +711,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
@@ -802,7 +802,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -826,7 +826,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -851,7 +851,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 10.1.0;
+				TULSI_XCODE_VERSION = 10.1.0.10B61;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Debug;
diff --git a/src/TulsiGeneratorIntegrationTests/update_goldens.sh b/src/TulsiGeneratorIntegrationTests/update_goldens.sh
index de71004..325eb19 100755
--- a/src/TulsiGeneratorIntegrationTests/update_goldens.sh
+++ b/src/TulsiGeneratorIntegrationTests/update_goldens.sh
@@ -21,7 +21,7 @@
 readonly TESTLOGS_DIR=$(bazel info bazel-testlogs)
 readonly OUTPUT_DIR="${TESTLOGS_DIR}/${TEST_PATH}"
 
-bazel test //src/TulsiGeneratorIntegrationTests:EndToEndGenerationTests && :
+bazel test //src/TulsiGeneratorIntegrationTests:EndToEndGenerationTests --nocheck_visibility && :
 
 bazel_exit_code=$?