Test fixes after rebase. Remove unnecessary new code.

dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java

@@ -34,7 +34,7 @@ import org.springframework.beans.factory.InitializingBean;
  * <p>
  * <strong>NOTE:</strong>  this class is overridden by one <em>of the same name</em>
  * defined in dspace-server-webapp and declared as a bean there.
- * See {@code config/spring/api/Z-mock-services.xml}.  Some kind of classpath
+ * See {@code test/data/dspaceFolder/config/spring/api/solr-services.xml}.  Some kind of classpath
  * magic makes this work.
  */
 public class MockSolrLoggerServiceImpl

dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java

@@ -72,7 +72,6 @@ import org.dspace.core.Constants;
 import org.dspace.disseminate.CitationDocumentServiceImpl;
 import org.dspace.eperson.Group;
 import org.dspace.services.ConfigurationService;
-import org.dspace.statistics.FakeDatabaseReader;
 import org.dspace.statistics.ObjectCount;
 import org.dspace.statistics.SolrLoggerServiceImpl;
 import org.dspace.statistics.factory.StatisticsServiceFactory;
@@ -119,13 +118,6 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
         StatisticsServiceFactory.getInstance().getSolrLoggerService().removeIndex("*:*");
     }
 
-    @BeforeClass
-    public static void mockGeoIP()
-            throws IOException {
-        // Set up a mock GeoIP implementation so we don't need to d/l a database.
-        new FakeDatabaseReader.Builder(); // Activate fake
-    }
-
     @Before
     @Override
     public void setUp() throws Exception {