diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/PlanConfig.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/PlanConfig.java
index 71590fa2e..cd22d13f0 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/PlanConfig.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/PlanConfig.java
@@ -25,6 +25,7 @@ import com.djrapitops.plugin.utilities.Verify;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.ZoneId;
@@ -60,6 +61,21 @@ public class PlanConfig extends Config {
         this.logger = logger;
     }
 
+    // For testing
+    public PlanConfig(
+            File configFile,
+            PlanFiles files,
+            WorldAliasSettings worldAliasSettings,
+            PluginLogger logger
+    ) {
+        super(configFile);
+
+        this.files = files;
+        this.extensionSettings = new ExtensionSettings(this);
+        this.worldAliasSettings = worldAliasSettings;
+        this.logger = logger;
+    }
+
     public <T> T get(Setting<T> setting) {
         T value = setting.getValueFrom(this);
         Verify.isTrue(setting.isValid(value), () -> new IllegalStateException(
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/settings/ConfigSettingKeyTest.java b/Plan/common/src/test/java/com/djrapitops/plan/settings/ConfigSettingKeyTest.java
index 020a44763..842e08f82 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/settings/ConfigSettingKeyTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/settings/ConfigSettingKeyTest.java
@@ -57,13 +57,13 @@ public class ConfigSettingKeyTest {
 
     public static void assertValidDefaultValuesForAllSettings(PlanConfig config, Iterable<Setting> settings) {
         List<String> fails = new ArrayList<>();
-        for (Setting setting : settings) {
+        for (Setting<?> setting : settings) {
             checkSettingForFailures(config, setting).ifPresent(fails::add);
         }
         assertTrue(fails.isEmpty(), fails::toString);
     }
 
-    private static Optional<String> checkSettingForFailures(PlanConfig config, Setting setting) {
+    private static Optional<String> checkSettingForFailures(PlanConfig config, Setting<?> setting) {
         try {
             if (!config.contains(setting.getPath())) {
                 return Optional.of("Did not contain " + setting.getPath());
@@ -138,7 +138,7 @@ public class ConfigSettingKeyTest {
     }
 
     private PlanConfig createConfig(File configFile) throws IOException {
-        PlanConfig config = new PlanConfig(configFile, null, new TestPluginLogger());
+        PlanConfig config = new PlanConfig(configFile, null, null, new TestPluginLogger());
         config.save();
         return config;
     }
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/settings/config/changes/ConfigUpdaterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/settings/config/changes/ConfigUpdaterTest.java
index daba0683b..bbbd8982a 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/settings/config/changes/ConfigUpdaterTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/settings/config/changes/ConfigUpdaterTest.java
@@ -84,7 +84,7 @@ class ConfigUpdaterTest {
         Path config = tempDir.resolve("oldconfig.yml");
         Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
 
-        PlanConfig planConfig = new PlanConfig(config.toFile(), null, new TestPluginLogger());
+        PlanConfig planConfig = new PlanConfig(config.toFile(), null, null, new TestPluginLogger());
 
         UNDER_TEST.applyConfigUpdate(planConfig);
 
@@ -100,7 +100,7 @@ class ConfigUpdaterTest {
         Path config = tempDir.resolve("oldconfig.yml");
         Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
 
-        PlanConfig planConfig = new PlanConfig(config.toFile(), null, new TestPluginLogger());
+        PlanConfig planConfig = new PlanConfig(config.toFile(), null, null, new TestPluginLogger());
 
         UNDER_TEST.applyConfigUpdate(planConfig);
 
@@ -122,7 +122,7 @@ class ConfigUpdaterTest {
         Path config = tempDir.resolve("oldconfig.yml");
         Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
 
-        PlanConfig planConfig = new PlanConfig(config.toFile(), null, new TestPluginLogger());
+        PlanConfig planConfig = new PlanConfig(config.toFile(), null, null, new TestPluginLogger());
 
         ConfigChange[] changes = UNDER_TEST.configEnhancementPatch();
         assertMoveChangesAreAppliedProperly(planConfig, changes);
@@ -133,7 +133,7 @@ class ConfigUpdaterTest {
         Path config = tempDir.resolve("oldconfig.yml");
         Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
 
-        PlanConfig planConfig = new PlanConfig(config.toFile(), null, new TestPluginLogger());
+        PlanConfig planConfig = new PlanConfig(config.toFile(), null, null, new TestPluginLogger());
 
         ConfigChange[] changes = UNDER_TEST.configEnhancementPatch();
         assertMoveChangesAreAppliedProperly(planConfig, changes);
diff --git a/Plan/common/src/test/java/utilities/FieldFetcher.java b/Plan/common/src/test/java/utilities/FieldFetcher.java
index f42b0bac0..73eb9fe05 100644
--- a/Plan/common/src/test/java/utilities/FieldFetcher.java
+++ b/Plan/common/src/test/java/utilities/FieldFetcher.java
@@ -27,7 +27,7 @@ public class FieldFetcher {
         /* static method class*/
     }
 
-    public static <T> List<T> getPublicStaticFields(Class fromClass, Class<T> ofType) throws IllegalAccessException {
+    public static <T> List<T> getPublicStaticFields(Class<?> fromClass, Class<T> ofType) throws IllegalAccessException {
         List<T> list = new ArrayList<>();
         for (Field field : fromClass.getDeclaredFields()) {
             if (!Modifier.isPublic(field.getModifiers())) {