diff --git a/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatData.java b/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatData.java
index 820e0a8..9c953d2 100644
--- a/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatData.java
+++ b/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatData.java
@@ -10,11 +10,18 @@
 @GenerateRealmFieldNames
 @GenerateRealmFields
 public class StatData implements RealmModel {
-    static final int SUM_DATA_index;
-    static final int AVG_DATA_index;
-    static final int MAX_DATA_index;
-    static final int MIN_DATA_index;
-    static Object[][] DATA_ = new Object[][]
+    static final int SUM_DATA_INDEX;
+    static final int AVG_DATA_INDEX;
+    static final int MAX_DATA_INDEX;
+    static final int MIN_DATA_INDEX;
+    static Object [] SUM_DATA = {395, 3.95666666666667d};
+    static Object [] AVG_DATA = {13057, 130.57f};
+    static Object [] MAX_DATA = {1089, 10.89f};
+    static Object [] MIN_DATA = {33, 0.33f};
+
+
+
+    static Object[][] DATA = new Object[][]
             {
                     {33, 0.33f},
                     {35, 0.35f},
@@ -57,10 +64,10 @@ public class StatData implements RealmModel {
             };
 
     static {
-        AVG_DATA_index = DATA_.length - 4;
-        SUM_DATA_index = DATA_.length - 3;
-        MAX_DATA_index = DATA_.length - 2;
-        MIN_DATA_index = DATA_.length - 1;
+        AVG_DATA_INDEX = DATA.length - 4;
+        SUM_DATA_INDEX = DATA.length - 3;
+        MAX_DATA_INDEX = DATA.length - 2;
+        MIN_DATA_INDEX = DATA.length - 1;
     }
 
 //    @PrimaryKey
diff --git a/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatDataTest.java b/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatDataTest.java
index 5bc3565..1c2faf0 100644
--- a/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatDataTest.java
+++ b/query/src/androidTest/java/com/quarkworks/android/realmtypesafequery/StatDataTest.java
@@ -15,14 +15,9 @@
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
 
-import static android.support.test.InstrumentationRegistry.getTargetContext;
-import static com.quarkworks.android.realmtypesafequery.StatData.AVG_DATA_index;
-import static com.quarkworks.android.realmtypesafequery.StatData.DATA_;
-import static com.quarkworks.android.realmtypesafequery.StatData.MAX_DATA_index;
-import static com.quarkworks.android.realmtypesafequery.StatData.MIN_DATA_index;
-import static com.quarkworks.android.realmtypesafequery.StatData.SUM_DATA_index;
-import static com.quarkworks.android.realmtypesafequery.generated.StatDataFields.INTEGER_FIELD;
-import static org.junit.Assert.assertEquals;
+import android.support.test.InstrumentationRegistry;
+import com.quarkworks.android.realmtypesafequery.generated.StatDataFields;
+import org.junit.Assert;
 
 @SuppressWarnings("ConstantConditions")
 @RunWith(AndroidJUnit4.class)
@@ -32,14 +27,14 @@ public class StatDataTest {
 
     @BeforeClass
     public static void setUpClass() {
-        Realm.init(getTargetContext());
+        Realm.init(InstrumentationRegistry.getTargetContext());
         RealmConfiguration config =
                 new RealmConfiguration.Builder().deleteRealmIfMigrationNeeded().build();
         Realm.setDefaultConfiguration(config);
         defaultInstance = Realm.getDefaultInstance();
         defaultInstance.beginTransaction();
         defaultInstance.deleteAll();
-        init_Data();
+        initRecords();
         defaultInstance.commitTransaction();
 
     }
@@ -51,54 +46,57 @@ public static void tearDownClass() {
     }
 
 
-    public static void init_Data() {
-        ArrayList<Object[]> data = new ArrayList<>(Arrays.asList(DATA_));
+    public static void initRecords() {
+        ArrayList<Object[]> data = new ArrayList<>(Arrays.asList(StatData.DATA));
         ListIterator<Object[]> dli = data.listIterator();
         while (dli.hasNext()) {
-            if (dli.nextIndex() == AVG_DATA_index)
+            if (dli.nextIndex() == StatData.AVG_DATA_INDEX)
                 break;
             Object[] vals = dli.next();
             StatData record = defaultInstance.createObject(StatData.class);
-            init(vals, record);
+            initRecord(vals, record);
         }
     }
 
 
-    private static void init(Object[] vals, StatData record) {
+    private static void initRecord(Object[] vals, StatData record) {
         record.integerField = (int) vals[0];
         record.floatField = (float) vals[1];
     }
 
     @Test
-    public void sum() {
+    public void sumInt() {
         int sum = (int) (RealmTypeSafeQuery.where(defaultInstance, StatData.class)
-                .sum(INTEGER_FIELD));
-        assertEquals(sum, DATA_[SUM_DATA_index][0]);
+                .sum(StatDataFields.INTEGER_FIELD));
+        //Assert.assertEquals(sum, StatData.DATA[StatData.SUM_DATA_INDEX][0]);
+        Assert.assertEquals(sum, StatData.SUM_DATA[0]);
 
     }
 
     @Test
-    public void avg() {
+    public void avgInt() {
         int average = (int) (RealmTypeSafeQuery.where(defaultInstance, StatData.class)
-                .average(INTEGER_FIELD));
-        assertEquals(average, DATA_[AVG_DATA_index][0]);
+                .average(StatDataFields.INTEGER_FIELD));
+        //Assert.assertEquals(average, StatData.DATA[StatData.AVG_DATA_INDEX][0]);
+        Assert.assertEquals(average, StatData.AVG_DATA[0]);
 
     }
 
     @Test
-    public void max() {
+    public void maxInt() {
         int max = RealmTypeSafeQuery.where(defaultInstance, StatData.class)
-                .max(INTEGER_FIELD).intValue();
-        assertEquals(max, DATA_[MAX_DATA_index][0]);
+                .max(StatDataFields.INTEGER_FIELD).intValue();
+        //Assert.assertEquals(max, StatData.DATA[StatData.MAX_DATA_INDEX][0]);
+        Assert.assertEquals(max, StatData.MAX_DATA[0]);
 
     }
 
     @Test
-    public void min() {
+    public void minInt() {
         int min = RealmTypeSafeQuery.where(defaultInstance, StatData.class)
-                .min(INTEGER_FIELD).intValue();
-        assertEquals(min, (DATA_[MIN_DATA_index][0]));
-
+                .min(StatDataFields.INTEGER_FIELD).intValue();
+        //Assert.assertEquals(min, (StatData.DATA[StatData.MIN_DATA_INDEX][0]));
+        Assert.assertEquals(min, StatData.MIN_DATA[0]);
     }
 
 }