diff --git a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportTest.java b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportTest.java
index c0eb2789bc..a4f6b67b06 100644
--- a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportTest.java
@@ -22,16 +22,16 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
 import org.junit.Test;
 
 public class MetadataImportTest extends AbstractIntegrationTest {
 
-    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    private CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    private CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private final ItemService itemService
+            = ContentServiceFactory.getInstance().getItemService();
+    private final CollectionService collectionService
+            = ContentServiceFactory.getInstance().getCollectionService();
+    private final CommunityService communityService
+            = ContentServiceFactory.getInstance().getCommunityService();
 
     @Test
     public void metadataImportTest() throws Exception {
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractCRUDBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractCRUDBuilder.java
index 72e08b062a..ff2bef51c2 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractCRUDBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractCRUDBuilder.java
@@ -13,6 +13,8 @@ import org.dspace.service.DSpaceCRUDService;
 
 /**
  * @author Jonas Van Goolen - (jonas@atmire.com)
+ *
+ * @param <T> A specific kind of ReloadableEntity.
  */
 public abstract class AbstractCRUDBuilder<T extends ReloadableEntity> extends AbstractBuilder<T, DSpaceCRUDService> {
 
@@ -20,8 +22,10 @@ public abstract class AbstractCRUDBuilder<T extends ReloadableEntity> extends Ab
         super(context);
     }
 
+    @Override
     protected abstract DSpaceCRUDService getService();
 
+    @Override
     public abstract T build();
 
     public void delete(T dso) throws Exception {
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
index 848bac54f4..df92d0ea4b 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
@@ -43,12 +43,15 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
         this.context = context;
     }
 
+    @Override
     public abstract void cleanup() throws Exception;
 
 
+    @Override
     protected abstract DSpaceObjectService<T> getService();
 
 
+    @Override
     protected <B> B handleException(final Exception e) {
         log.error(e.getMessage(), e);
         return null;
@@ -231,13 +234,15 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
         return (B) this;
     }
 
+    @Override
     public abstract T build() throws SQLException, AuthorizeException;
 
+    @Override
     public void delete(Context c, T dso) throws Exception {
-       if (dso != null) {
-           getService().delete(c, dso);
-       }
-       c.complete();
-       indexingService.commit();
+        if (dso != null) {
+            getService().delete(c, dso);
+        }
+        c.complete();
+        indexingService.commit();
     }
 }
diff --git a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
index 2b19489475..b8942a17d0 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
@@ -129,6 +129,7 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
         return this;
     }
 
+    @Override
     public Bitstream build() {
         try {
             bitstreamService.update(context, bitstream);
@@ -152,7 +153,7 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
 
     @Override
     public void cleanup() throws Exception {
-       try (Context c = new Context()) {
+        try (Context c = new Context()) {
             c.turnOffAuthorisationSystem();
             // Ensure object and any related objects are reloaded before checking to see what needs cleanup
             bitstream = c.reloadEntity(bitstream);
@@ -163,6 +164,7 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
         }
     }
 
+    @Override
     protected DSpaceObjectService<Bitstream> getService() {
         return bitstreamService;
     }
diff --git a/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
index 6b15ca432f..614cd54c6d 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BundleBuilder.java
@@ -25,7 +25,7 @@ public class BundleBuilder extends AbstractDSpaceObjectBuilder<Bundle>  {
     private Bundle bundle;
     private Item item;
     private String name;
-    private List<Bitstream> bitstreams = new ArrayList<>();
+    private final List<Bitstream> bitstreams = new ArrayList<>();
 
     protected BundleBuilder(Context context) {
         super(context);
@@ -52,6 +52,7 @@ public class BundleBuilder extends AbstractDSpaceObjectBuilder<Bundle>  {
         return this;
     }
 
+    @Override
     public void cleanup() throws Exception {
         try (Context c = new Context()) {
             c.turnOffAuthorisationSystem();
@@ -64,10 +65,12 @@ public class BundleBuilder extends AbstractDSpaceObjectBuilder<Bundle>  {
         }
     }
 
+    @Override
     protected DSpaceObjectService<Bundle> getService() {
         return bundleService;
     }
 
+    @Override
     public Bundle build() throws SQLException, AuthorizeException {
         bundle = bundleService.create(context, item, name);
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java b/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
index 2f2c7522a5..08257030af 100644
--- a/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/EPersonBuilder.java
@@ -10,6 +10,7 @@ package org.dspace.builder;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
+import org.apache.log4j.Logger;
 
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.service.DSpaceObjectService;
@@ -19,6 +20,7 @@ import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 
 public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
+    private static final Logger LOG = Logger.getLogger(EPersonBuilder.class);
 
     private EPerson ePerson;
 
@@ -39,20 +41,18 @@ public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
         }
     }
 
+    @Override
     protected DSpaceObjectService<EPerson> getService() {
         return ePersonService;
     }
 
+    @Override
     public EPerson build() {
         try {
             ePersonService.update(context, ePerson);
             indexingService.commit();
-        } catch (SearchServiceException e) {
-            e.printStackTrace();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (AuthorizeException e) {
-            e.printStackTrace();
+        } catch (SearchServiceException | SQLException | AuthorizeException e) {
+            LOG.warn("Failed to complete the EPerson", e);
         }
         return ePerson;
     }
@@ -65,10 +65,8 @@ public class EPersonBuilder extends AbstractDSpaceObjectBuilder<EPerson> {
     private EPersonBuilder create() {
         try {
             ePerson = ePersonService.create(context);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (AuthorizeException e) {
-            e.printStackTrace();
+        } catch (SQLException | AuthorizeException e) {
+            LOG.warn("Failed to create the EPerson", e);
         }
         return this;
     }
diff --git a/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java b/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
index 5c17e9ef53..ae0e807198 100644
--- a/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/EntityTypeBuilder.java
@@ -53,6 +53,7 @@ public class EntityTypeBuilder extends AbstractBuilder<EntityType, EntityTypeSer
         }
     }
 
+    @Override
     public EntityType build() {
         try {
 
@@ -91,7 +92,7 @@ public class EntityTypeBuilder extends AbstractBuilder<EntityType, EntityTypeSer
             this.entityType = entityTypeService.create(context, entityType);
 
         } catch (SQLException | AuthorizeException e) {
-            e.printStackTrace();
+            log.warn("Failed to create the EntityType", e);
         }
 
         return this;
diff --git a/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java b/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
index d209e0ec7d..dfc9112a3f 100644
--- a/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/MetadataFieldBuilder.java
@@ -64,17 +64,9 @@ public class MetadataFieldBuilder extends AbstractBuilder<MetadataField, Metadat
             context.dispatchEvents();
 
             indexingService.commit();
-        } catch (SearchServiceException e) {
-            log.error(e);
-        } catch (SQLException e) {
-            log.error(e);
-        } catch (AuthorizeException e) {
-            log.error(e);
-            ;
-        } catch (NonUniqueMetadataException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (SearchServiceException | SQLException | AuthorizeException
+                | NonUniqueMetadataException | IOException e) {
+            log.error("Failed to complete MetadataField", e);
         }
         return metadataField;
     }
@@ -104,7 +96,7 @@ public class MetadataFieldBuilder extends AbstractBuilder<MetadataField, Metadat
             MetadataField metadataField = metadataFieldService.find(c, id);
             if (metadataField != null) {
                 try {
-                     metadataFieldService.delete(c, metadataField);
+                    metadataFieldService.delete(c, metadataField);
                 } catch (AuthorizeException e) {
                     throw new RuntimeException(e);
                 }
@@ -141,7 +133,7 @@ public class MetadataFieldBuilder extends AbstractBuilder<MetadataField, Metadat
             metadataField = metadataFieldService
                 .create(context, schema, element, qualifier, scopeNote);
         } catch (NonUniqueMetadataException e) {
-            e.printStackTrace();
+            log.error("Failed to create MetadataField", e);
         }
 
         return this;
diff --git a/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java b/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
index 86186df9ab..10e1894ee4 100644
--- a/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/MetadataSchemaBuilder.java
@@ -63,15 +63,10 @@ public class MetadataSchemaBuilder extends AbstractBuilder<MetadataSchema, Metad
             context.dispatchEvents();
 
             indexingService.commit();
-        } catch (SearchServiceException e) {
+        } catch (SearchServiceException | SQLException | AuthorizeException e) {
             log.error(e);
-        } catch (SQLException e) {
-            log.error(e);
-        } catch (AuthorizeException e) {
-            log.error(e);
-            ;
         } catch (NonUniqueMetadataException e) {
-            e.printStackTrace();
+            log.error("Failed to complete MetadataSchema", e);
         }
         return metadataSchema;
     }
@@ -101,7 +96,7 @@ public class MetadataSchemaBuilder extends AbstractBuilder<MetadataSchema, Metad
             MetadataSchema metadataSchema = metadataSchemaService.find(c, id);
             if (metadataSchema != null) {
                 try {
-                     metadataSchemaService.delete(c, metadataSchema);
+                    metadataSchemaService.delete(c, metadataSchema);
                 } catch (AuthorizeException e) {
                     throw new RuntimeException(e);
                 }
@@ -123,7 +118,7 @@ public class MetadataSchemaBuilder extends AbstractBuilder<MetadataSchema, Metad
         try {
             metadataSchema = metadataSchemaService.create(context, name, namespace);
         } catch (NonUniqueMetadataException e) {
-            e.printStackTrace();
+            log.error("Failed to create MetadataSchema", e);
         }
 
         return this;
diff --git a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
index 886c1ddc06..400dbc7b9f 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
@@ -57,6 +57,7 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
         }
     }
 
+    @Override
     public Process build() {
         try {
             processService.update(context, process);
@@ -68,6 +69,7 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
         return process;
     }
 
+    @Override
     protected ProcessService getService() {
         return processService;
     }
diff --git a/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
index f53340c345..773a4a8b8b 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RelationshipBuilder.java
@@ -56,6 +56,7 @@ public class RelationshipBuilder extends AbstractBuilder<Relationship, Relations
         }
     }
 
+    @Override
     public Relationship build() {
         try {
 
@@ -117,7 +118,7 @@ public class RelationshipBuilder extends AbstractBuilder<Relationship, Relations
         try {
             relationship = relationshipService.create(context, leftItem, rightItem, relationshipType, 0, 0);
         } catch (SQLException | AuthorizeException e) {
-            e.printStackTrace();
+            log.warn("Failed to create relationship", e);
         }
 
         return this;
diff --git a/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
index aa56eed802..fb1bd9281d 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RelationshipTypeBuilder.java
@@ -62,6 +62,7 @@ public class RelationshipTypeBuilder extends AbstractBuilder<RelationshipType, R
         }
     }
 
+    @Override
     public RelationshipType build() {
         try {
 
@@ -116,7 +117,7 @@ public class RelationshipTypeBuilder extends AbstractBuilder<RelationshipType, R
                             leftCardinalityMax, rightCardinalityMin, rightCardinalityMax);
 
         } catch (SQLException | AuthorizeException e) {
-            e.printStackTrace();
+            log.error("Failed to create RelationshipType", e);
         }
 
         return this;
diff --git a/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java b/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
index bb443ab4a4..bc687a43f5 100644
--- a/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
+++ b/dspace-api/src/test/java/org/dspace/license/MockCCLicenseConnectorServiceImpl.java
@@ -29,6 +29,7 @@ public class MockCCLicenseConnectorServiceImpl extends CCLicenseConnectorService
      * @param language - the language
      * @return a map of mocked licenses with the id and the license
      */
+    @Override
     public Map<String, CCLicense> retrieveLicenses(String language) {
         Map<String, CCLicense> ccLicenses = new HashMap<>();
         CCLicense mockLicense1 = createMockLicense(1, new int[]{3, 2, 3});
@@ -89,6 +90,7 @@ public class MockCCLicenseConnectorServiceImpl extends CCLicenseConnectorService
      * @param answerMap - the answers to the different field questions
      * @return the CC License URI
      */
+    @Override
     public String retrieveRightsByQuestion(final String licenseId,
                                            final String language,
                                            final Map<String, String> answerMap) {
@@ -105,6 +107,7 @@ public class MockCCLicenseConnectorServiceImpl extends CCLicenseConnectorService
      * @return a mock license RDF document or null when the URI contains invalid
      * @throws IOException
      */
+    @Override
     public Document retrieveLicenseRDFDoc(String licenseURI) throws IOException {
         if (!StringUtils.contains(licenseURI, "invalid")) {
             InputStream cclicense = null;
diff --git a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
index d7893f779d..6faf9a7d1b 100644
--- a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
+++ b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
@@ -110,7 +110,7 @@ public class MockSolrServer {
                 server.deleteByQuery("*:*");
                 server.commit();
             } catch (SolrServerException | IOException e) {
-                e.printStackTrace(System.err);
+                log.error("Failed to empty Solr index:  {}", e.getMessage(), e);
             }
 
             loadedCores.put(coreName, server);
diff --git a/dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java b/dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java
index 791941c3b7..6216f7223a 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java
@@ -27,8 +27,6 @@ import com.maxmind.geoip2.record.MaxMind;
 import com.maxmind.geoip2.record.Postal;
 import com.maxmind.geoip2.record.RepresentedCountry;
 import com.maxmind.geoip2.record.Traits;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.dspace.solr.MockSolrServer;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -42,8 +40,6 @@ public class MockSolrLoggerServiceImpl
         extends SolrLoggerServiceImpl
         implements InitializingBean, DisposableBean {
 
-    private static final Logger log = LogManager.getLogger();
-
     private MockSolrServer mockSolrServer;
 
     public MockSolrLoggerServiceImpl() {
diff --git a/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowFactoryTest.java b/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowFactoryTest.java
index a19e6a2622..7118d82621 100644
--- a/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowFactoryTest.java
+++ b/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowFactoryTest.java
@@ -11,6 +11,7 @@ import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.sql.SQLException;
+import org.apache.logging.log4j.LogManager;
 
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
@@ -35,9 +36,11 @@ import org.junit.Test;
  */
 public class XmlWorkflowFactoryTest extends AbstractUnitTest {
 
-    private CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    private CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    private XmlWorkflowFactory xmlWorkflowFactory
+    private final CollectionService collectionService
+            = ContentServiceFactory.getInstance().getCollectionService();
+    private final CommunityService communityService
+            = ContentServiceFactory.getInstance().getCommunityService();
+    private final XmlWorkflowFactory xmlWorkflowFactory
             = new DSpace().getServiceManager().getServiceByName("xmlWorkflowFactory",
             XmlWorkflowFactoryImpl.class);
     private Community owningCommunity;
@@ -47,7 +50,7 @@ public class XmlWorkflowFactoryTest extends AbstractUnitTest {
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(XmlWorkflowFactoryTest.class);
+    private static final Logger log = LogManager.getLogger(XmlWorkflowFactoryTest.class);
 
     /**
      * This method will be run before every test as per @Before. It will
@@ -112,12 +115,12 @@ public class XmlWorkflowFactoryTest extends AbstractUnitTest {
     @Test
     public void workflowMapping_NonMappedCollection() throws WorkflowConfigurationException {
         Workflow workflow = xmlWorkflowFactory.getWorkflow(this.nonMappedCollection);
-        assertEquals(workflow.getID(), "defaultWorkflow");
+        assertEquals("defaultWorkflow", workflow.getID());
     }
 
     @Test
     public void workflowMapping_MappedCollection() throws WorkflowConfigurationException {
         Workflow workflow = xmlWorkflowFactory.getWorkflow(this.mappedCollection);
-        assertEquals(workflow.getID(), "selectSingleReviewer");
+        assertEquals("selectSingleReviewer", workflow.getID());
     }
 }