diff --git a/app/src/test/java/be/ugent/sel/studeez/FunctionalCustomTimerUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalCustomTimerUnitTest.kt
similarity index 90%
rename from app/src/test/java/be/ugent/sel/studeez/FunctionalCustomTimerUnitTest.kt
rename to app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalCustomTimerUnitTest.kt
index 29f7fcf..24f9a3a 100644
--- a/app/src/test/java/be/ugent/sel/studeez/FunctionalCustomTimerUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalCustomTimerUnitTest.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez
+package be.ugent.sel.studeez.timer_functional
 
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalCustomTimer
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
@@ -31,6 +31,7 @@ class FunctionalCustomTimerUnitTest : FunctionalTimerUnitTest() {
     override fun testEnded() {
         timer = FunctionalCustomTimer(0)
         timer.tick()
+        Assert.assertTrue(timer.hasEnded())
         Assert.assertEquals(
             FunctionalTimer.DONE,
             timer.view
diff --git a/app/src/test/java/be/ugent/sel/studeez/FunctionalEndlessTimerUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalEndlessTimerUnitTest.kt
similarity index 90%
rename from app/src/test/java/be/ugent/sel/studeez/FunctionalEndlessTimerUnitTest.kt
rename to app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalEndlessTimerUnitTest.kt
index ffaf05e..35eca7a 100644
--- a/app/src/test/java/be/ugent/sel/studeez/FunctionalEndlessTimerUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalEndlessTimerUnitTest.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez
+package be.ugent.sel.studeez.timer_functional
 
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalEndlessTimer
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
@@ -32,6 +32,7 @@ class FunctionalEndlessTimerUnitTest : FunctionalTimerUnitTest() {
         val n = 1000
         for (i in 1..n) {
             timer.tick()
+            Assert.assertFalse(timer.hasEnded())
             Assert.assertEquals(
                 FunctionalTimer.FOCUS,
                 timer.view
diff --git a/app/src/test/java/be/ugent/sel/studeez/FunctionalTimerUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalTimerUnitTest.kt
similarity index 94%
rename from app/src/test/java/be/ugent/sel/studeez/FunctionalTimerUnitTest.kt
rename to app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalTimerUnitTest.kt
index a330eb9..4d26d06 100644
--- a/app/src/test/java/be/ugent/sel/studeez/FunctionalTimerUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FunctionalTimerUnitTest.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez
+package be.ugent.sel.studeez.timer_functional
 
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
 import org.junit.Before
diff --git a/app/src/test/java/be/ugent/sel/studeez/FuntionalPomodoroTimerUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FuntionalPomodoroTimerUnitTest.kt
similarity index 94%
rename from app/src/test/java/be/ugent/sel/studeez/FuntionalPomodoroTimerUnitTest.kt
rename to app/src/test/java/be/ugent/sel/studeez/timer_functional/FuntionalPomodoroTimerUnitTest.kt
index f7cbfb6..32a3783 100644
--- a/app/src/test/java/be/ugent/sel/studeez/FuntionalPomodoroTimerUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/timer_functional/FuntionalPomodoroTimerUnitTest.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez
+package be.ugent.sel.studeez.timer_functional
 
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalPomodoroTimer
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
@@ -48,6 +48,7 @@ class FuntionalPomodoroTimerUnitTest : FunctionalTimerUnitTest() {
     override fun testEnded() {
         pomodoroTimer = FunctionalPomodoroTimer(0, 0, 0)
         pomodoroTimer.tick()
+        Assert.assertTrue(pomodoroTimer.hasEnded())
         Assert.assertEquals(
             FunctionalTimer.DONE,
             pomodoroTimer.view,
@@ -59,6 +60,7 @@ class FuntionalPomodoroTimerUnitTest : FunctionalTimerUnitTest() {
         for (i in 0..10) {
             pomodoroTimer.tick()
         }
+        Assert.assertFalse(pomodoroTimer.hasEnded())
         Assert.assertTrue(pomodoroTimer.isInBreak)
         Assert.assertEquals(
             FunctionalTimer.BREAK,
diff --git a/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/timer_functional/TimeUnitTest.kt
similarity index 97%
rename from app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt
rename to app/src/test/java/be/ugent/sel/studeez/timer_functional/TimeUnitTest.kt
index 9570860..86fdce8 100644
--- a/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/timer_functional/TimeUnitTest.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez
+package be.ugent.sel.studeez.timer_functional
 
 import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSeconds
 import be.ugent.sel.studeez.data.local.models.timer_functional.Time