diff --git a/services/git-bridge/build.xml b/services/git-bridge/build.xml
index adcaf38c14..a312d6a490 100644
--- a/services/git-bridge/build.xml
+++ b/services/git-bridge/build.xml
@@ -197,14 +197,14 @@
     </dirset>
   </path>
   
-  <path id="writelatex-git-bridge.module.test.sourcepath">
-    <dirset dir="${module.writelatex-git-bridge.basedir}">
-      <include name="test"/>
+  <path id="writelatex-git-bridge.module.test.unit.sourcepath">
+    <dirset dir="${module.writelatex-git-bridge.basedir}/test">
+      <include name="unit"/>
     </dirset>
   </path>
   
   
-  <target name="compile.module.writelatex-git-bridge" depends="compile.module.writelatex-git-bridge.production,compile.module.writelatex-git-bridge.tests" description="Compile module writelatex-git-bridge"/>
+  <target name="compile.module.writelatex-git-bridge" depends="compile.module.writelatex-git-bridge.production,compile.module.writelatex-git-bridge.tests.unit" description="Compile module writelatex-git-bridge"/>
   
   <target name="compile.module.writelatex-git-bridge.production" description="Compile module writelatex-git-bridge; production classes">
     <mkdir dir="${writelatex-git-bridge.output.dir}"/>
@@ -224,13 +224,13 @@
     </copy>
   </target>
   
-  <target name="compile.module.writelatex-git-bridge.tests" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
+  <target name="compile.module.writelatex-git-bridge.tests.unit" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
     <mkdir dir="${writelatex-git-bridge.testoutput.dir}"/>
     <javac destdir="${writelatex-git-bridge.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
       <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
       <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
       <classpath refid="writelatex-git-bridge.module.classpath"/>
-      <src refid="writelatex-git-bridge.module.test.sourcepath"/>
+      <src refid="writelatex-git-bridge.module.test.unit.sourcepath"/>
       <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
     </javac>
     
@@ -300,7 +300,7 @@
     <delete dir="${artifacts.temp.dir}"/>
   </target>
 
-  <target name="test.unit" depends="compile.module.writelatex-git-bridge.tests">
+  <target name="test.unit" depends="compile.module.writelatex-git-bridge.tests.unit">
     <junit>
       <classpath>
         <path refid="writelatex-git-bridge.module.classpath"/>
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/MainTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/MainTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/MainTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/MainTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/AttsResourceHandlerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/AttsResourceHandlerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/AttsResourceHandlerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/AttsResourceHandlerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContentsTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContentsTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContentsTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContentsTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandlerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandlerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandlerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandlerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHookTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHookTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHookTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHookTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfigTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfigTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfigTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfigTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContentsTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContentsTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContentsTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContentsTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalkerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalkerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalkerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalkerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/util/UtilTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/util/UtilTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/util/UtilTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/util/UtilTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/ProjectLockTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/ProjectLockTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/ProjectLockTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/ProjectLockTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcherTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcherTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcherTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcherTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshotTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshotTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshotTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshotTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPITest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPITest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPITest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPITest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethodTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethodTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethodTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethodTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/ResultTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/ResultTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/ResultTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/ResultTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResultTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResultTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResultTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResultTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachmentTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachmentTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachmentTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachmentTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotDataTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotDataTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotDataTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotDataTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFileTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFileTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFileTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFileTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResultTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResultTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResultTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResultTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResultTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResultTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResultTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResultTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfoTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfoTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfoTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfoTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUserTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUserTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUserTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUserTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContentsTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContentsTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContentsTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContentsTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManagerTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManagerTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManagerTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManagerTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResultTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResultTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResultTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResultTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilderTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilderTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilderTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilderTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackExceptionTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackExceptionTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackExceptionTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackExceptionTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContentsTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContentsTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContentsTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContentsTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFileTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFileTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFileTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFileTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlobTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlobTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlobTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlobTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/BlobTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/BlobTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/BlobTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/BlobTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlobTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlobTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlobTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlobTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlobTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlobTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlobTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlobTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlobTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlobTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlobTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlobTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNodeTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNodeTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNodeTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNodeTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNodeTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNodeTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNodeTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNodeTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNodeTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNodeTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNodeTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNodeTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHashTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHashTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHashTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHashTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStoreTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStoreTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStoreTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStoreTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStoreTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStoreTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStoreTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStoreTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStoreTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStoreTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStoreTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStoreTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStoreTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStoreTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStoreTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStoreTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabaseTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabaseTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabaseTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabaseTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQueryTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQueryTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQueryTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQueryTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQueryTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQueryTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQueryTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQueryTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQueryTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQueryTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQueryTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQueryTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQueryTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQueryTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQueryTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQueryTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdateTest.java
diff --git a/services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdateTest.java b/services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdateTest.java
similarity index 100%
rename from services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdateTest.java
rename to services/git-bridge/test/unit/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdateTest.java
diff --git a/services/git-bridge/writelatex-git-bridge.iml b/services/git-bridge/writelatex-git-bridge.iml
index 1a3513abee..6c4e59ec5b 100644
--- a/services/git-bridge/writelatex-git-bridge.iml
+++ b/services/git-bridge/writelatex-git-bridge.iml
@@ -5,6 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/system" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />