diff --git a/tests/build/reports/tests/test/index.html b/tests/build/reports/tests/test/index.html
index e355f4f..1d48a29 100644
--- a/tests/build/reports/tests/test/index.html
+++ b/tests/build/reports/tests/test/index.html
@@ -20,7 +20,7 @@ <h1>Test Summary</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">1</div>
+<div class="counter">24</div>
 <p>tests</p>
 </div>
 </td>
@@ -38,7 +38,7 @@ <h1>Test Summary</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.004s</div>
+<div class="counter">0.131s</div>
 <p>duration</p>
 </div>
 </td>
@@ -80,12 +80,42 @@ <h2>Packages</h2>
 <tbody>
 <tr>
 <td class="success">
-<a href="packages/de.tomgrill.gdxtesting.UserRequirements.html">de.tomgrill.gdxtesting.UserRequirements</a>
+<a href="packages/de.tomgrill.gdxtesting.ClassTests.html">de.tomgrill.gdxtesting.ClassTests</a>
+</td>
+<td>9</td>
+<td>0</td>
+<td>0</td>
+<td>0.016s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="packages/de.tomgrill.gdxtesting.FunctionalRequirements.html">de.tomgrill.gdxtesting.FunctionalRequirements</a>
+</td>
+<td>12</td>
+<td>0</td>
+<td>0</td>
+<td>0.104s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="packages/de.tomgrill.gdxtesting.NonFunctionalRequirements.html">de.tomgrill.gdxtesting.NonFunctionalRequirements</a>
 </td>
 <td>1</td>
 <td>0</td>
 <td>0</td>
-<td>0.004s</td>
+<td>0.002s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="packages/de.tomgrill.gdxtesting.UserRequirements.html">de.tomgrill.gdxtesting.UserRequirements</a>
+</td>
+<td>2</td>
+<td>0</td>
+<td>0</td>
+<td>0.009s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -107,12 +137,172 @@ <h2>Classes</h2>
 <tbody>
 <tr>
 <td class="success">
+<a href="classes/de.tomgrill.gdxtesting.ClassTests.BoatTests.html">de.tomgrill.gdxtesting.ClassTests.BoatTests</a>
+</td>
+<td>6</td>
+<td>0</td>
+<td>0</td>
+<td>0.015s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.ClassTests.LaneTests.html">de.tomgrill.gdxtesting.ClassTests.LaneTests</a>
+</td>
+<td>3</td>
+<td>0</td>
+<td>0</td>
+<td>0.001s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_AI.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_AI</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.002s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_COLLISIONS.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_COLLISIONS</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_COURSE_BOUNDARIES.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_COURSE_BOUNDARIES</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_FINISH.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_FINISH</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.003s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_MUSIC.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_MUSIC</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.003s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_OBSTACLE_INCREASE.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_OBSTACLE_INCREASE</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.003s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_PENALTY.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_PENALTY</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_POWERUPS.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_POWERUPS</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.075s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_SPEED_CONTROL.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_SPEED_CONTROL</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.010s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIMER.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIMER</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.008s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIREDNESS.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIREDNESS</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.FunctionalRequirements.FR_UNIQUE_BOATS.html">de.tomgrill.gdxtesting.FunctionalRequirements.FR_UNIQUE_BOATS</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.NonFunctionalRequirements.NFR_RESPONSIVE.html">de.tomgrill.gdxtesting.NonFunctionalRequirements.NFR_RESPONSIVE</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.002s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
+<a href="classes/de.tomgrill.gdxtesting.UserRequirements.UR_FINAL_PLACE.html">de.tomgrill.gdxtesting.UserRequirements.UR_FINAL_PLACE</a>
+</td>
+<td>1</td>
+<td>0</td>
+<td>0</td>
+<td>0.008s</td>
+<td class="success">100%</td>
+</tr>
+<tr>
+<td class="success">
 <a href="classes/de.tomgrill.gdxtesting.UserRequirements.UR_MIN_BOATS.html">de.tomgrill.gdxtesting.UserRequirements.UR_MIN_BOATS</a>
 </td>
 <td>1</td>
 <td>0</td>
 <td>0</td>
-<td>0.004s</td>
+<td>0.001s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -126,7 +316,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 6.8-rc-1</a> at 9 Feb 2021, 14:01:56</p>
+<a href="http://www.gradle.org">Gradle 6.8-rc-1</a> at 9 Feb 2021, 14:35:39</p>
 </div>
 </div>
 </body>
diff --git a/tests/build/test-results/test/binary/results.bin b/tests/build/test-results/test/binary/results.bin
index 954b594..bd7ee31 100644
Binary files a/tests/build/test-results/test/binary/results.bin and b/tests/build/test-results/test/binary/results.bin differ
diff --git a/tests/build/tmp/compileTestJava/source-classes-mapping.txt b/tests/build/tmp/compileTestJava/source-classes-mapping.txt
index a7d21b5..8e9d751 100644
--- a/tests/build/tmp/compileTestJava/source-classes-mapping.txt
+++ b/tests/build/tmp/compileTestJava/source-classes-mapping.txt
@@ -10,8 +10,8 @@ de/tomgrill/gdxtesting/FunctionalRequirements/FR_OBSTACLE_INCREASE.java
  de.tomgrill.gdxtesting.FunctionalRequirements.FR_OBSTACLE_INCREASE
 de/tomgrill/gdxtesting/FunctionalRequirements/FR_UNIQUE_BOATS.java
  de.tomgrill.gdxtesting.FunctionalRequirements.FR_UNIQUE_BOATS
-de/tomgrill/gdxtesting/UserRequirements/UR_MIN_BOATS.java
- de.tomgrill.gdxtesting.UserRequirements.UR_MIN_BOATS
+de/tomgrill/gdxtesting/FunctionalRequirements/FR_TIMER.java
+ de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIMER
 de/tomgrill/gdxtesting/ClassTests/LaneTests.java
  de.tomgrill.gdxtesting.ClassTests.LaneTests
 de/tomgrill/gdxtesting/FunctionalRequirements/FR_COLLISIONS.java
@@ -32,5 +32,5 @@ de/tomgrill/gdxtesting/FunctionalRequirements/FR_FINISH.java
  de.tomgrill.gdxtesting.FunctionalRequirements.FR_FINISH
 de/tomgrill/gdxtesting/FunctionalRequirements/FR_TIREDNESS.java
  de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIREDNESS
-de/tomgrill/gdxtesting/FunctionalRequirements/FR_TIMER.java
- de.tomgrill.gdxtesting.FunctionalRequirements.FR_TIMER
+de/tomgrill/gdxtesting/UserRequirements/UR_MIN_BOATS.java
+ de.tomgrill.gdxtesting.UserRequirements.UR_MIN_BOATS