diff --git a/common/core/src/main/java/zingg/common/core/block/CacheBasedHashFunctionUtility.java b/common/core/src/main/java/zingg/common/core/block/CacheBasedHashFunctionUtility.java
index f6e8f82ec..a8aa65358 100644
--- a/common/core/src/main/java/zingg/common/core/block/CacheBasedHashFunctionUtility.java
+++ b/common/core/src/main/java/zingg/common/core/block/CacheBasedHashFunctionUtility.java
@@ -12,7 +12,7 @@ public class CacheBasedHashFunctionUtility<D, R, C, T> implements IHashFunctionU
     private static final String DELIMITER = ":";
 
     public CacheBasedHashFunctionUtility() {
-        this.hashFunctionsInCurrentNodePath = new HashSet<>();
+        this.hashFunctionsInCurrentNodePath = new HashSet<String>();
     }
 
     @Override
diff --git a/common/core/src/test/java/zingg/common/core/block/data/DataUtility.java b/common/core/src/test/java/zingg/common/core/block/data/DataUtility.java
index 5fc58d087..1c79677bd 100644
--- a/common/core/src/test/java/zingg/common/core/block/data/DataUtility.java
+++ b/common/core/src/test/java/zingg/common/core/block/data/DataUtility.java
@@ -3,6 +3,7 @@
 import com.opencsv.exceptions.CsvException;
 import zingg.common.core.block.model.Customer;
 import zingg.common.core.block.model.CustomerDupe;
+import zingg.common.core.util.IDataReader;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -11,9 +12,9 @@
 
 public class DataUtility {
 
-    private final DataReader dataReader;
+    private final IDataReader dataReader;
 
-    public DataUtility(DataReader dataReader) {
+    public DataUtility(IDataReader dataReader) {
         this.dataReader = dataReader;
     }
 
diff --git a/common/core/src/test/java/zingg/common/core/util/CsvReader.java b/common/core/src/test/java/zingg/common/core/util/CsvReader.java
index d7d36eb65..088c38c77 100644
--- a/common/core/src/test/java/zingg/common/core/util/CsvReader.java
+++ b/common/core/src/test/java/zingg/common/core/util/CsvReader.java
@@ -3,7 +3,6 @@
 import com.opencsv.CSVReader;
 import com.opencsv.CSVReaderBuilder;
 import com.opencsv.exceptions.CsvException;
-import zingg.common.core.block.data.ICsvReader;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/common/core/src/test/java/zingg/common/core/block/data/ICsvReader.java b/common/core/src/test/java/zingg/common/core/util/ICsvReader.java
similarity index 56%
rename from common/core/src/test/java/zingg/common/core/block/data/ICsvReader.java
rename to common/core/src/test/java/zingg/common/core/util/ICsvReader.java
index 41e2fa3ba..eb6dd88a4 100644
--- a/common/core/src/test/java/zingg/common/core/block/data/ICsvReader.java
+++ b/common/core/src/test/java/zingg/common/core/util/ICsvReader.java
@@ -1,9 +1,8 @@
-package zingg.common.core.block.data;
+package zingg.common.core.util;
 
-import zingg.common.core.util.IFromCsv;
 import java.io.FileNotFoundException;
 import java.util.List;
 
-public interface ICsvReader extends DataReader {
+public interface ICsvReader extends IDataReader {
     List<? extends IFromCsv> getRecords(String file, boolean skipHeader) throws FileNotFoundException;
 }
diff --git a/common/core/src/test/java/zingg/common/core/block/data/DataReader.java b/common/core/src/test/java/zingg/common/core/util/IDataReader.java
similarity index 78%
rename from common/core/src/test/java/zingg/common/core/block/data/DataReader.java
rename to common/core/src/test/java/zingg/common/core/util/IDataReader.java
index 03f4ec457..c8883d43f 100644
--- a/common/core/src/test/java/zingg/common/core/block/data/DataReader.java
+++ b/common/core/src/test/java/zingg/common/core/util/IDataReader.java
@@ -1,4 +1,4 @@
-package zingg.common.core.block.data;
+package zingg.common.core.util;
 
 import com.opencsv.exceptions.CsvException;
 
@@ -6,6 +6,6 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
-public interface DataReader {
+public interface IDataReader {
     List<String[]> readDataFromSource(String source) throws IOException, CsvException, URISyntaxException;
 }