diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
index 99d86863f..ac4239461 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
@@ -79,8 +79,7 @@ public AuthenticationInformation logIn(final String username, final String passw
 	}
 
 	public void logout(final SessionId sessionId) throws ESException {
-		final SessionId clonedSessionId = checkSessionId(sessionId);
-		accessControl.getLoginService().logout(clonedSessionId.toAPI());
+		accessControl.getLoginService().logout(ModelUtil.clone(sessionId).toAPI());
 		sessions.remove(sessionId);
 	}
 
@@ -106,7 +105,7 @@ public PrimaryVersionSpec createVersion(final SessionId sessionId, final Project
 		final PrimaryVersionSpec baseVersionSpec, final AbstractChangePackage changePackage,
 		final BranchVersionSpec targetBranch,
 		final PrimaryVersionSpec sourceVersion, final LogMessage logMessage)
-			throws ESException, InvalidVersionSpecException {
+		throws ESException, InvalidVersionSpecException {
 
 		AbstractChangePackage cp = changePackage;
 		final SessionId clonedSessionId = checkSessionId(sessionId);
@@ -122,7 +121,7 @@ public PrimaryVersionSpec createVersion(final SessionId sessionId, final Project
 
 	public PrimaryVersionSpec resolveVersionSpec(final SessionId sessionId, final ProjectId projectId,
 		final VersionSpec versionSpec)
-			throws ESException {
+		throws ESException {
 
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
@@ -150,7 +149,7 @@ public List<BranchInfo> getBranches(final SessionId sessionId, final ProjectId p
 
 	public List<HistoryInfo> getHistoryInfo(final SessionId sessionId, final ProjectId projectId,
 		final HistoryQuery<?> historyQuery)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
 			emfStore.getHistoryInfo(
@@ -161,7 +160,7 @@ public List<HistoryInfo> getHistoryInfo(final SessionId sessionId, final Project
 
 	public void addTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
 		final TagVersionSpec tag)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.addTag(
 			clonedSessionId,
@@ -172,7 +171,7 @@ public void addTag(final SessionId sessionId, final ProjectId projectId, final P
 
 	public void removeTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
 		final TagVersionSpec tag)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.removeTag(
 			clonedSessionId,
@@ -183,7 +182,7 @@ public void removeTag(final SessionId sessionId, final ProjectId projectId, fina
 
 	public ProjectInfo createEmptyProject(final SessionId sessionId, final String name, final String description,
 		final LogMessage logMessage)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		final ProjectInfo projectInfo = emfStore.createEmptyProject(clonedSessionId, name, description,
 			ModelUtil.clone(logMessage));
@@ -243,7 +242,7 @@ public ProjectHistory exportProjectHistoryFromServer(final SessionId sessionId,
 
 	public FileTransferInformation uploadFileChunk(final SessionId sessionId, final ProjectId projectId,
 		final FileChunk fileChunk)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return emfStore.uploadFileChunk(clonedSessionId, ModelUtil.clone(projectId), fileChunk);
 	}
@@ -256,7 +255,7 @@ public FileChunk downloadFileChunk(final SessionId sessionId, final ProjectId pr
 
 	public void transmitProperty(final SessionId sessionId, final OrgUnitProperty changedProperty, final ACUser user,
 		final ProjectId projectId)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.transmitProperty(
 			clonedSessionId,
@@ -318,7 +317,7 @@ public String getVersion(final ServerInfo serverInfo) throws ESException {
 	 */
 	public String uploadChangePackageFragment(final SessionId sessionId, final ProjectId projectId,
 		final ChangePackageEnvelope envelope)
-			throws ESException {
+		throws ESException {
 
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 
@@ -336,7 +335,7 @@ public String uploadChangePackageFragment(final SessionId sessionId, final Proje
 	 */
 	public ChangePackageEnvelope downloadChangePackageFragment(final SessionId sessionId, final String proxyId,
 		final int fragmentIndex)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
 			emfStore.downloadChangePackageFragment(