diff --git a/Plan/build.gradle b/Plan/build.gradle
index 554c2b4bf..76a8f0c6d 100644
--- a/Plan/build.gradle
+++ b/Plan/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id "org.sonarqube" version "2.6.2"
     id "net.ltgt.apt" version "0.19"
     id "net.ltgt.apt-idea" version "0.19"
-    id "com.github.johnrengelman.shadow" version "4.0.2"
+    id "com.github.johnrengelman.shadow" version "5.0.0"
 }
 
 allprojects {
@@ -15,7 +15,7 @@ allprojects {
     version "4.7.2"
 
     test {
-//        useJUnitPlatform()
+        useJUnitPlatform()
         testLogging {
             events "passed", "failed"
             exceptionFormat "full"
@@ -117,6 +117,9 @@ subprojects {
         testCompile "mysql:mysql-connector-java:8.0.15" // MySQL
     }
 
+    shadowJar {
+        exclude 'META-INF/versions/'
+    }
 
     configurations {
         testArtifacts.extendsFrom testRuntime
diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle
index 52df07866..9dd9b05d0 100644
--- a/Plan/common/build.gradle
+++ b/Plan/common/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     compile "com.djrapitops:AbstractPluginFramework-api:$abstractPluginFrameworkVersion"
-    compile project(path: ":api", configuration: 'shadow')
+    compile project(":api")
     compile project(path: ":extensions", configuration: 'shadow')
     compile "com.djrapitops:PlanPluginBridge:$planPluginBridgeVersion"
     compile "org.apache.httpcomponents:httpclient:$httpClientVersion"
@@ -14,7 +14,7 @@ dependencies {
     compile "com.maxmind.geoip2:geoip2:$geoIpVersion"
     compileOnly "com.google.guava:guava:$guavaVersion"
 
-    testCompile project(path: ":api", configuration: 'shadow')
+    testCompile project(":api")
 }
 
 shadowJar {
diff --git a/Plan/gradle/wrapper/gradle-wrapper.jar b/Plan/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd..5c2d1cf01 100644
Binary files a/Plan/gradle/wrapper/gradle-wrapper.jar and b/Plan/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Plan/gradlew b/Plan/gradlew
index af6708ff2..b0d6d0ab5 100755
--- a/Plan/gradlew
+++ b/Plan/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/Plan/gradlew.bat b/Plan/gradlew.bat
index 6d57edc70..9991c5032 100644
--- a/Plan/gradlew.bat
+++ b/Plan/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/scripts/runCheckstyle.sh b/scripts/runCheckstyle.sh
index 016647f66..1c6cf059a 100644
--- a/scripts/runCheckstyle.sh
+++ b/scripts/runCheckstyle.sh
@@ -1,5 +1,5 @@
 set -e
 cd $TRAVIS_BUILD_DIR/Plan
-gradle checkstyleMain
-gradle checkstyleTest
+./gradlew checkstyleMain
+./gradlew checkstyleTest
 cd $HOME
diff --git a/scripts/runTests.sh b/scripts/runTests.sh
index 7ed549ea4..8a2177bdf 100644
--- a/scripts/runTests.sh
+++ b/scripts/runTests.sh
@@ -1,4 +1,4 @@
 set -e
 cd $TRAVIS_BUILD_DIR/Plan
-gradle test --info
+./gradlew test --info
 cd $HOME
diff --git a/scripts/sonar.sh b/scripts/sonar.sh
index 4c7c27fcd..66faf5c33 100644
--- a/scripts/sonar.sh
+++ b/scripts/sonar.sh
@@ -1,6 +1,6 @@
 set -e
 cd $TRAVIS_BUILD_DIR/Plan
 if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then 
-	gradle sonarqube
+	./gradlew sonarqube
 fi
 cd $HOME