diff --git a/Darkly.xcodeproj/project.pbxproj b/Darkly.xcodeproj/project.pbxproj
index d38faaec..a67d1e3e 100644
--- a/Darkly.xcodeproj/project.pbxproj
+++ b/Darkly.xcodeproj/project.pbxproj
@@ -481,7 +481,7 @@
 		CC36AA8C1B6D5FED008200F1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = Darkly;
 				TargetAttributes = {
 					23AA1AB51B721E3E00FE6A00 = {
@@ -847,6 +847,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -970,6 +971,7 @@
 				);
 				INFOPLIST_FILE = DarklyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "Darkly.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -987,6 +989,7 @@
 				GCC_PREFIX_HEADER = "Darkly/Darkly-Prefix.pch";
 				INFOPLIST_FILE = DarklyTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "Darkly.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/Darkly/LDEventModel.m b/Darkly/LDEventModel.m
index 909334fc..8237b43b 100644
--- a/Darkly/LDEventModel.m
+++ b/Darkly/LDEventModel.m
@@ -57,8 +57,8 @@ - (id)initWithDictionary:(NSDictionary *)dictionary {
         self.kind = [dictionary objectForKey: kKindKey];
         NSNumber *creationDateValue = [dictionary objectForKey:kCreationDateKey];
         self.creationDate = [creationDateValue longValue];
-        self.featureKeyValue = [dictionary objectForKey: kFeatureKeyValueServerKey];
-        self.isDefault = [dictionary objectForKey: kIsDefaultServerKey];
+        self.featureKeyValue = [[dictionary objectForKey: kFeatureKeyValueServerKey] boolValue];
+        self.isDefault = [[dictionary objectForKey: kIsDefaultServerKey] boolValue];
         self.user = [[LDUserModel alloc] initWithDictionary:[dictionary objectForKey:kUserKey]];
     }
     return self;
diff --git a/Darkly/LDUserModel.m b/Darkly/LDUserModel.m
index b97da57b..1be33b01 100644
--- a/Darkly/LDUserModel.m
+++ b/Darkly/LDUserModel.m
@@ -101,7 +101,7 @@ - (id)initWithDictionary:(NSDictionary *)dictionary {
         self.custom = [dictionary objectForKey: kCustomKey];
         self.device = [dictionary objectForKey: kDeviceKey];
         self.os = [dictionary objectForKey: kOsKey];
-        self.anonymous = [dictionary objectForKey: kAnonymousKey];
+        self.anonymous = [[dictionary objectForKey: kAnonymousKey] boolValue];
         self.config = [[LDFlagConfigModel alloc] initWithDictionary:[dictionary objectForKey:kConfigKey]];
         if ([dictionary objectForKey:kUpdatedAtKey]) {
             self.updatedAt = [dictionary objectForKey:kUpdatedAtKey];
diff --git a/DarklyTests/Info.plist b/DarklyTests/Info.plist
index 7453162c..ba72822e 100644
--- a/DarklyTests/Info.plist
+++ b/DarklyTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>Darkly.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>