diff --git a/src/main/java/com/pahimar/ee3/command/CommandRunTest.java b/src/main/java/com/pahimar/ee3/command/CommandRunTest.java
index 0890de47..8935b64f 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandRunTest.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandRunTest.java
@@ -15,29 +15,26 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CommandRunTest extends CommandEE
-{
+public class CommandRunTest extends CommandEE {
+
     @Override
-    public String getCommandName()
-    {
+    public String getCommandName() {
         return Names.Commands.RUN_TEST;
     }
 
     @Override
-    public int getRequiredPermissionLevel()
-    {
+    public int getRequiredPermissionLevel() {
         return 2;
     }
 
     @Override
-    public String getCommandUsage(ICommandSender commandSender)
-    {
+    public String getCommandUsage(ICommandSender commandSender) {
         return Messages.Commands.RUN_TEST_USAGE;
     }
 
     @Override
-    public void processCommand(ICommandSender commandSender, String[] args)
-    {
+    public void processCommand(ICommandSender commandSender, String[] args) {
+
         if (args.length == 2) {
 
             boolean testFound = false;
@@ -64,27 +61,26 @@ public class CommandRunTest extends CommandEE
                 throw new WrongUsageException(Messages.Commands.RUN_TEST_USAGE);
             }
         }
-        else
-        {
+        else {
             throw new WrongUsageException(Messages.Commands.RUN_TEST_USAGE);
         }
     }
 
     @Override
-    public List addTabCompletionOptions(ICommandSender commandSender, String[] args)
-    {
-        if (args.length == 2)
-        {
+    public List addTabCompletionOptions(ICommandSender commandSender, String[] args) {
+
+        if (args.length == 2) {
+
             File testCaseDirectory = new File(FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory(), "data" + File.separator + Reference.LOWERCASE_MOD_ID + File.separator + "energyvalues" + File.separator + "testcases");
             testCaseDirectory.mkdirs();
 
-            ArrayList<String> fileNames = new ArrayList<String>();
+            ArrayList<String> fileNames = new ArrayList<>();
 
-            for (File testCaseFile : testCaseDirectory.listFiles())
-            {
-                if (testCaseFile.isFile() && testCaseFile.getAbsolutePath().endsWith(".json"))
-                {
-                    fileNames.add(testCaseFile.getName());
+            if (Tests.globalTestDirectory != null) {
+                for (File testCaseFile : Tests.globalTestDirectory.listFiles()) {
+                    if (testCaseFile.isFile() && testCaseFile.getAbsolutePath().endsWith(".json")) {
+                        fileNames.add(testCaseFile.getName());
+                    }
                 }
             }
 
diff --git a/src/main/java/com/pahimar/ee3/reference/Files.java b/src/main/java/com/pahimar/ee3/reference/Files.java
index 6871e033..6a61b709 100644
--- a/src/main/java/com/pahimar/ee3/reference/Files.java
+++ b/src/main/java/com/pahimar/ee3/reference/Files.java
@@ -30,6 +30,7 @@ public class Files {
         globalDataDirectory = new File(event.getModConfigurationDirectory().getParentFile(), "data" + File.separator + Reference.LOWERCASE_MOD_ID);
         Tests.globalTestDirectory = new File(globalDataDirectory, "tests");
         Tests.globalTestDirectory.mkdirs();
+        Tests.VANILLA_TEST_SUITE.save();
 
         EnergyValueRegistry.energyValuesDirectory = new File(globalDataDirectory, "energy-values");
         EnergyValueRegistry.energyValuesDirectory.mkdirs();
diff --git a/src/main/java/com/pahimar/ee3/reference/Tests.java b/src/main/java/com/pahimar/ee3/reference/Tests.java
index 7dc02d7e..7a44014e 100644
--- a/src/main/java/com/pahimar/ee3/reference/Tests.java
+++ b/src/main/java/com/pahimar/ee3/reference/Tests.java
@@ -1,12 +1,12 @@
 package com.pahimar.ee3.reference;
 
-import com.pahimar.ee3.test.EnergyValueTestSuite;
 import com.pahimar.ee3.test.VanillaTestSuite;
 
 import java.io.File;
 
 public class Tests {
+
     public static File globalTestDirectory;
 
-    public static final EnergyValueTestSuite VANILLA_TEST_SUITE = new VanillaTestSuite();
+    public static final VanillaTestSuite VANILLA_TEST_SUITE = new VanillaTestSuite();
 }