diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 40e55a9..c9a2b1b 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,26 +16,24 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 16
-    - name: Cache SonarCloud packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.sonar/cache
-        key: ${{ runner.os }}-sonar
-        restore-keys: ${{ runner.os }}-sonar
+        java-version: 17
+
     - name: Cache Gradle packages
       uses: actions/cache@v1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build and analyze
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: ./gradlew build sonarqube --info
+
+    - name: Build
+      run: ./gradlew build
+
+    - name: Build
+      run: ./gradlew test
diff --git a/src/test/java/telraam/logic/SimpleLapperTest.java b/src/test/java/telraam/logic/simple/SimpleLapperTest.java
similarity index 97%
rename from src/test/java/telraam/logic/SimpleLapperTest.java
rename to src/test/java/telraam/logic/simple/SimpleLapperTest.java
index 7758c47..838397f 100644
--- a/src/test/java/telraam/logic/SimpleLapperTest.java
+++ b/src/test/java/telraam/logic/simple/SimpleLapperTest.java
@@ -1,4 +1,4 @@
-package telraam.logic;
+package telraam.logic.simple;
 
 import org.jdbi.v3.core.Jdbi;
 import org.junit.jupiter.api.BeforeEach;
@@ -8,6 +8,7 @@
 import telraam.database.models.Detection;
 import telraam.database.models.Lap;
 import telraam.database.models.LapSource;
+import telraam.logic.Lapper;
 import telraam.logic.simple.SimpleLapper;
 
 import java.sql.Timestamp;