diff --git a/openbis-ipad/BisMac.xcodeproj/project.pbxproj b/openbis-ipad/BisMac.xcodeproj/project.pbxproj
index a681ee8caec9dcf67349bc6b88c8f872ce49c754..01ba6a2a9e6ba4822648b3223e497e2c6bfe59fe 100644
--- a/openbis-ipad/BisMac.xcodeproj/project.pbxproj
+++ b/openbis-ipad/BisMac.xcodeproj/project.pbxproj
@@ -29,7 +29,8 @@
 		3687CF5815DD4FE4009E3019 /* readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 3687CF5715DD4FE4009E3019 /* readme.md */; };
 		36F108C6160A103E00D7B142 /* CISDOBLiveConnectionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F108C4160A04CA00D7B142 /* CISDOBLiveConnectionTest.m */; };
 		36F71E4C1619829300C87277 /* persistent-data-model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 36F71E4A1619829300C87277 /* persistent-data-model.xcdatamodeld */; };
-		36F71E4F1619834600C87277 /* CIDOBIpadEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71E4E1619834600C87277 /* CIDOBIpadEntity.m */; };
+		36F71E4F1619834600C87277 /* CISDOBIpadEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71E4E1619834600C87277 /* CISDOBIpadEntity.m */; };
+		36F71E64161AD77B00C87277 /* CISDOBIpadEntityTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 36F71E63161AD77B00C87277 /* CISDOBIpadEntityTest.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -87,8 +88,10 @@
 		36F108C3160A04CA00D7B142 /* CISDOBLiveConnectionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBLiveConnectionTest.h; sourceTree = "<group>"; };
 		36F108C4160A04CA00D7B142 /* CISDOBLiveConnectionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CISDOBLiveConnectionTest.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		36F71E4B1619829300C87277 /* persistent-data-model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "persistent-data-model.xcdatamodel"; sourceTree = "<group>"; };
-		36F71E4D1619834600C87277 /* CIDOBIpadEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CIDOBIpadEntity.h; sourceTree = "<group>"; };
-		36F71E4E1619834600C87277 /* CIDOBIpadEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CIDOBIpadEntity.m; sourceTree = "<group>"; };
+		36F71E4D1619834600C87277 /* CISDOBIpadEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBIpadEntity.h; sourceTree = "<group>"; };
+		36F71E4E1619834600C87277 /* CISDOBIpadEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBIpadEntity.m; sourceTree = "<group>"; };
+		36F71E62161AD77B00C87277 /* CISDOBIpadEntityTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CISDOBIpadEntityTest.h; sourceTree = "<group>"; };
+		36F71E63161AD77B00C87277 /* CISDOBIpadEntityTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CISDOBIpadEntityTest.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -227,8 +230,8 @@
 				3680B1321611B5CE008BA207 /* CISDOBIpadService.h */,
 				3680B1331611B5CE008BA207 /* CISDOBIpadService.m */,
 				36F71E4A1619829300C87277 /* persistent-data-model.xcdatamodeld */,
-				36F71E4D1619834600C87277 /* CIDOBIpadEntity.h */,
-				36F71E4E1619834600C87277 /* CIDOBIpadEntity.m */,
+				36F71E4D1619834600C87277 /* CISDOBIpadEntity.h */,
+				36F71E4E1619834600C87277 /* CISDOBIpadEntity.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -242,6 +245,8 @@
 				36F108C4160A04CA00D7B142 /* CISDOBLiveConnectionTest.m */,
 				3680B1381612E832008BA207 /* CISDOBIpadServiceTest.h */,
 				3680B1391612E832008BA207 /* CISDOBIpadServiceTest.m */,
+				36F71E62161AD77B00C87277 /* CISDOBIpadEntityTest.h */,
+				36F71E63161AD77B00C87277 /* CISDOBIpadEntityTest.m */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -401,7 +406,7 @@
 				3680B1341611B5CE008BA207 /* CISDOBIpadService.m in Sources */,
 				3680B13716120319008BA207 /* CISDOBAsyncCall.m in Sources */,
 				36F71E4C1619829300C87277 /* persistent-data-model.xcdatamodeld in Sources */,
-				36F71E4F1619834600C87277 /* CIDOBIpadEntity.m in Sources */,
+				36F71E4F1619834600C87277 /* CISDOBIpadEntity.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -414,6 +419,7 @@
 				3649C8E315ED13540019AC55 /* CISDOBJsonRpcCallTest.m in Sources */,
 				3680B13A1612E832008BA207 /* CISDOBIpadServiceTest.m in Sources */,
 				3680B13D1612E8B6008BA207 /* CISDOBAsyncTest.m in Sources */,
+				36F71E64161AD77B00C87277 /* CISDOBIpadEntityTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/openbis-ipad/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index 1a4b4150e6ceea177a956502bffbf8e0fe12e640..add5679d22386a29d2166225a01779345dd9feda 100644
Binary files a/openbis-ipad/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ