diff --git a/Countly.xcodeproj/project.pbxproj b/Countly.xcodeproj/project.pbxproj
index d29acd28..ff9ebcf7 100644
--- a/Countly.xcodeproj/project.pbxproj
+++ b/Countly.xcodeproj/project.pbxproj
@@ -537,6 +537,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 3S32KFMHB8;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
@@ -561,6 +562,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 3S32KFMHB8;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
diff --git a/CountlyTests/CountlyDeviceIDTests.swift b/CountlyTests/CountlyDeviceIDTests.swift
index 208e9685..1e659c5d 100644
--- a/CountlyTests/CountlyDeviceIDTests.swift
+++ b/CountlyTests/CountlyDeviceIDTests.swift
@@ -121,7 +121,7 @@ class CountlyDeviceIDTests: CountlyBaseTestCase {
 #else
         var UUID = CountlyPersistency.sharedInstance().retrieveNSUUID()
         if UUID == nil {
-            UUID = UUID().uuidString
+            UUID = NSUUID().uuidString
             CountlyPersistency.sharedInstance().storeNSUUID(UUID)
         }