diff --git a/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
index 954e810a65..d81088bd33 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/ModificationsCommandBuilder.java
@@ -28,7 +28,6 @@ import java.io.IOException;
  * @since 2.0
  */
 @Slf4j
-@AllArgsConstructor
 @RequiredArgsConstructor
 @Accessors(fluent = true)
 public final class ModificationsCommandBuilder {
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
index 90a6248b48..9eb7427a4f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
@@ -258,7 +258,7 @@ public final class RepositoryService implements Closeable {
    *                                      by the implementation of the repository service provider.
    */
   public ModificationsCommandBuilder getModificationsCommand() {
-    logger.debug("create modifications command for repository {}", repository.getName());
+    logger.debug("create modifications command for repository {}",repository.getNamespaceAndName());
     return new ModificationsCommandBuilder(provider.getModificationsCommand(),repository, cacheManager.getCache(ModificationsCommandBuilder.CACHE_NAME), preProcessorUtil);
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsDto.java
index a6b1c84f1a..9ea0359157 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsDto.java
@@ -36,10 +36,4 @@ public class ModificationsDto extends HalRepresentation {
     return super.add(links);
   }
 
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation withEmbedded(String rel, List<? extends HalRepresentation> halRepresentations) {
-    return super.withEmbedded(rel, halRepresentations);
-  }
-
-
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
index f30163dac2..28f855f40c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsRootResource.java
@@ -34,20 +34,12 @@ public class ModificationsRootResource {
   /**
    * Get the file modifications related to a revision.
    * file modifications are for example: Modified, Added or Removed.
-   *
-   * @param namespace
-   * @param name
-   * @param revision
-   * @return
-   * @throws IOException
-   * @throws RevisionNotFoundException
-   * @throws RepositoryNotFoundException
    */
   @GET
   @StatusCodes({
     @ResponseCode(code = 200, condition = "success"),
     @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
-    @ResponseCode(code = 403, condition = "not authorized, the current user has no privileges to read the changeset"),
+    @ResponseCode(code = 403, condition = "not authorized, the current user has no privileges to read the modifications"),
     @ResponseCode(code = 404, condition = "not found, no changeset with the specified id is available in the repository"),
     @ResponseCode(code = 500, condition = "internal server error")
   })
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsToDtoMapper.java
index 19242b7ea6..422d8fc4d9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsToDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ModificationsToDtoMapper.java
@@ -14,7 +14,7 @@ import javax.inject.Inject;
 import static de.otto.edison.hal.Links.linkingTo;
 
 @Mapper
-public abstract class ModificationsToDtoMapper extends BaseMapper<Modifications, ModificationsDto> {
+public abstract class ModificationsToDtoMapper {
 
   @Inject
   private ResourceLinks resourceLinks;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java
index e0e851c581..dbd409a23b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class BranchRootResourceTest extends BaseRepositoryTest {
+public class BranchRootResourceTestBase extends RepositoryTestBase {
 
   public static final String BRANCH_PATH = "space/repo/branches/master";
   public static final String BRANCH_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + BRANCH_PATH;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java
index 9adb53976c..a9d2541f36 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class ChangesetRootResourceTest extends BaseRepositoryTest{
+public class ChangesetRootResourceTestBase extends RepositoryTestBase {
 
 
   public static final String CHANGESET_PATH = "space/repo/changesets/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java
index 020a099fe9..9d2c5c9e85 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class DiffResourceTest extends BaseRepositoryTest {
+public class DiffResourceTestBase extends RepositoryTestBase {
 
 
   public static final String DIFF_PATH = "space/repo/diff/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java
index 7dcf2acbd3..700534af98 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class FileHistoryResourceTest extends BaseRepositoryTest {
+public class FileHistoryResourceTestBase extends RepositoryTestBase {
 
   public static final String FILE_HISTORY_PATH = "space/repo/history/";
   public static final String FILE_HISTORY_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + FILE_HISTORY_PATH;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java
index 7dfcda2578..3b4f275346 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class ModificationsResourceTest extends BaseRepositoryTest {
+public class ModificationsResourceTestBase extends RepositoryTestBase {
 
 
   public static final String MODIFICATIONS_PATH = "space/repo/modifications/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java
index d25cfe0a71..ef416608bb 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java
@@ -64,7 +64,7 @@ import static sonia.scm.api.v2.resources.PermissionDto.GROUP_PREFIX;
   password = "secret",
   configuration = "classpath:sonia/scm/repository/shiro.ini"
 )
-public class PermissionRootResourceTest extends BaseRepositoryTest {
+public class PermissionRootResourceTestBase extends RepositoryTestBase {
   private static final String REPOSITORY_NAMESPACE = "repo_namespace";
   private static final String REPOSITORY_NAME = "repo";
   private static final String PERMISSION_WRITE = "repository:permissionWrite:" + REPOSITORY_NAME;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java
index fcc3c50058..83ed8e8356 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java
@@ -55,7 +55,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
   password = "secret",
   configuration = "classpath:sonia/scm/repository/shiro.ini"
 )
-public class RepositoryRootResourceTest extends BaseRepositoryTest {
+public class RepositoryRootResourceTestBase extends RepositoryTestBase {
 
   private Dispatcher dispatcher;
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BaseRepositoryTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTestBase.java
similarity index 97%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/BaseRepositoryTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTestBase.java
index a219681ea5..c3cc56958a 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BaseRepositoryTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTestBase.java
@@ -4,7 +4,7 @@ import sonia.scm.repository.RepositoryManager;
 
 import javax.inject.Provider;
 
-public class BaseRepositoryTest {
+public abstract class RepositoryTestBase {
 
 
   protected RepositoryToRepositoryDtoMapper repositoryToDtoMapper;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java
index 855ae2a861..4709ca26c3 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java
@@ -32,7 +32,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
 
 
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class SourceRootResourceTest extends BaseRepositoryTest {
+public class SourceRootResourceTestBase extends RepositoryTestBase {
 
   private Dispatcher dispatcher;
   private final URI baseUri = URI.create("/");
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java
index ec225b782b..7192954280 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java
@@ -38,7 +38,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
 
 @Slf4j
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class TagRootResourceTest extends BaseRepositoryTest {
+public class TagRootResourceTestBase extends RepositoryTestBase {
 
   public static final String TAG_PATH = "space/repo/tags/";
   public static final String TAG_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + TAG_PATH;