diff --git a/Assets/Common/Scripts/BootScreen.cs b/Assets/Common/Scripts/BootScreen.cs
index b1a7c71..ff2f9e6 100644
--- a/Assets/Common/Scripts/BootScreen.cs
+++ b/Assets/Common/Scripts/BootScreen.cs
@@ -31,7 +31,21 @@ public class BootScreen : MonoBehaviour
         {
             if (0 < WebCamTexture.devices.Length)
             {
-                SystemController.GetInstance().SwapScene("Common/Scenes/MainMenuScreen");
+                WebCamTexture webcamTexture = new WebCamTexture();
+                webcamTexture.deviceName = WebCamTexture.devices[0].name;
+
+                webcamTexture.Play();
+                yield return new WaitForSeconds(0.1f); // Wait a little for the webcam to start
+
+                if (webcamTexture.isPlaying)
+                {
+                    webcamTexture.Stop();
+                    SystemController.GetInstance().SwapScene("Common/Scenes/MainMenuScreen");
+                }
+                else
+                {
+                    errorText.text = "Zorg ervoor dat je webcam niet in gebruik is door een andere applicatie!";
+                }
             }
             else
             {
@@ -43,4 +57,6 @@ public class BootScreen : MonoBehaviour
             errorText.text = "Zorg ervoor dat deze applicatie toegang heeft tot je webcam!";
         }
     }
+
+
 }
diff --git a/Assets/Common/Scripts/UserButton.cs b/Assets/Common/Scripts/UserButton.cs
index ee25a5e..1958b9c 100644
--- a/Assets/Common/Scripts/UserButton.cs
+++ b/Assets/Common/Scripts/UserButton.cs
@@ -3,7 +3,7 @@ using UnityEngine;
 using UnityEngine.UI;
 
 /// <summary>
-/// Handles actions when a user presses the account button (upper left corner)
+/// Handles actions when a user presses the account button (upper right corner)
 /// </summary>
 public class UserButton : MonoBehaviour
 {
diff --git a/Assets/Common/Tests/PlayMode/BackButtonTests.cs b/Assets/Common/Tests/PlayMode/BackButtonTests.cs
index a802033..fbc3f64 100644
--- a/Assets/Common/Tests/PlayMode/BackButtonTests.cs
+++ b/Assets/Common/Tests/PlayMode/BackButtonTests.cs
@@ -7,12 +7,15 @@ using UnityEngine.TestTools;
 
 public class BackButtonTests
 {
-
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -24,15 +27,28 @@ public class BackButtonTests
         yield return new WaitForSeconds(0.2f);
     }
 
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_BackButtonTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Tests returning to the previous screen with the backbutton
+    /// </summary>
+    /// <returns></returns>
     [UnityTest]
     public IEnumerator BackTest()
     {
 
-        var backButton = (BackButton)GameObject.FindObjectOfType(typeof(BackButton));
+        var backButton = GameObject.FindObjectOfType<BackButton> ();
         backButton.Back();
         yield return new WaitForSeconds(0.2f);
 
-        var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
         Assert.IsNotNull(mainMenuScreen);
     }
 }
diff --git a/Assets/Common/Tests/PlayMode/CommonPlayMode.asmdef b/Assets/Common/Tests/PlayMode/CommonPlayMode.asmdef
index 1f100b1..b1b5755 100644
--- a/Assets/Common/Tests/PlayMode/CommonPlayMode.asmdef
+++ b/Assets/Common/Tests/PlayMode/CommonPlayMode.asmdef
@@ -10,7 +10,10 @@
         "Unity.TextMeshPro",
         "AccountsScripts",
         "SignPredictor",
-        "ArchitectureScripts"
+        "ArchitectureScripts",
+        "HangmanScripts",
+        "MinigameScripts",
+        "SpellingBeeScripts"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Common/Tests/PlayMode/CourseActivityTests.cs b/Assets/Common/Tests/PlayMode/CourseActivityTests.cs
index 15829a0..77f90b1 100644
--- a/Assets/Common/Tests/PlayMode/CourseActivityTests.cs
+++ b/Assets/Common/Tests/PlayMode/CourseActivityTests.cs
@@ -7,29 +7,80 @@ using UnityEngine.TestTools;
 
 public class CourseActivityTests
 {
-
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
         PersistentDataController.GetInstance().Load();
         AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
-        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/Boot");
         yield return new WaitForSeconds(0.2f);
     }
 
-    [UnityTest]
-    public IEnumerator StartCoursesTests()
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_CourseActivityTests()
     {
-        var courseActivityScreen = (CourseActivityScreen)GameObject.FindObjectOfType(typeof(CourseActivityScreen));
-        courseActivityScreen.StartCourse();
+        PersistentDataController.PATH = null;
+    }
+    /// <summary>
+    /// Full tests of the CoursesActivityScreen
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator CoursesActivityTest()
+    {
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        mainMenuScreen.GotoCourses();
         yield return new WaitForSeconds(0.2f);
 
-        var templateCourse = (CoursesController)GameObject.FindObjectOfType(typeof(CoursesController));
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        Assert.IsNotNull(courseMenuScreen, "Course was not started.");
+
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+
+        yield return new WaitForSeconds(0.2f);
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return new WaitForSeconds(0.5f);
+
+        var templateCourse = GameObject.FindObjectOfType<CoursesController>();
         Assert.IsNotNull(templateCourse);
+
+        templateCourse.ReturnToActivityScreen();
+        yield return new WaitForSeconds(0.2f);
+
+        var courseActivityScreen2 = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen2);
+
+        courseActivityScreen2.ResetCourseProgress();
+        yield return new WaitForSeconds(0.2f);
+
+        var templateCourse2 = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(templateCourse2);
+
+        var user = UserList.GetCurrentUser();
+        var progress = user.GetCourseProgress(0);
+        progress.progress = 1.00f;
+        progress.inUseLearnables = 0;
+
+        templateCourse2.ReturnToActivityScreen();
+        yield return new WaitForSeconds(0.2f);
     }
 }
+
diff --git a/Assets/Common/Tests/PlayMode/CourseItemTests.cs b/Assets/Common/Tests/PlayMode/CourseItemTests.cs
new file mode 100644
index 0000000..cb816ea
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/CourseItemTests.cs
@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using UnityEngine.UI;
+using System.Collections;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+public class CourseItemTests
+{
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CoursesMenuScreen");
+        yield return new WaitForSeconds(0.2f);
+    }
+
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_CourseItemTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test to verify the callback function of a course item button.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator CallBackTest()
+    {
+        GameObject buttonObject = GameObject.Find("Course Item(Clone)");
+        Assert.IsNotNull(buttonObject, "Could not find button object");
+
+        Button button = buttonObject.GetComponent<Button>();
+        Assert.IsNotNull(button, "Button component not found on button object");
+
+        button.onClick.Invoke();
+
+        yield return new WaitForSeconds(0.2f);
+
+        Assert.AreEqual("CourseActivityScreen", SceneManager.GetActiveScene().name);
+    }
+}
diff --git a/Assets/Common/Tests/PlayMode/CourseItemTests.cs.meta b/Assets/Common/Tests/PlayMode/CourseItemTests.cs.meta
new file mode 100644
index 0000000..7790306
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/CourseItemTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a28438bb0357417498e419043955e596
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Common/Tests/PlayMode/CourseMenuScreenTests.cs b/Assets/Common/Tests/PlayMode/CourseMenuScreenTests.cs
index 88922a3..fc5b7aa 100644
--- a/Assets/Common/Tests/PlayMode/CourseMenuScreenTests.cs
+++ b/Assets/Common/Tests/PlayMode/CourseMenuScreenTests.cs
@@ -7,12 +7,15 @@ using UnityEngine.TestTools;
 
 public class CourseMenuScreenTests
 {
-
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -22,15 +25,59 @@ public class CourseMenuScreenTests
         yield return new WaitForSeconds(0.2f);
     }
 
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_CourseMenuScreenTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test to verify the navigation to the list of courses screen.
+    /// </summary>
     [UnityTest]
     public IEnumerator GotoListOfCoursesTest()
     {
-        var courseMenuScreen = (CourseMenuScreen)GameObject.FindObjectOfType(typeof(CourseMenuScreen));
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
         courseMenuScreen.GotoListOfCourses();
         yield return new WaitForSeconds(0.2f);
 
-        var listCoursesScreen = (ListCoursesScreen)GameObject.FindObjectOfType(typeof(ListCoursesScreen));
+        var listCoursesScreen = GameObject.FindObjectOfType<ListCoursesScreen>();
         Assert.IsNotNull(listCoursesScreen);
     }
-}
 
+    /// <summary>
+    /// Test to verify the navigation to the recent courses screen.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator RecentCoursesTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        Assert.IsNotNull(courseMenuScreen, "Course was not started.");
+
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+
+        yield return new WaitForSeconds(0.2f);
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return new WaitForSeconds(0.5f);
+
+        var templateCourse = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(templateCourse);
+
+        templateCourse.ReturnToActivityScreen();
+        yield return new WaitForSeconds(0.2f);
+
+        GameObject backbutton = GameObject.Find("ButtonBack");
+        Assert.IsNotNull(backbutton);
+        backbutton.GetComponent<UnityEngine.UI.Button>().onClick.Invoke();
+        yield return null;
+    }
+}
diff --git a/Assets/Common/Tests/PlayMode/ListCoursesScreenTests.cs b/Assets/Common/Tests/PlayMode/ListCoursesScreenTests.cs
index 1334264..9281712 100644
--- a/Assets/Common/Tests/PlayMode/ListCoursesScreenTests.cs
+++ b/Assets/Common/Tests/PlayMode/ListCoursesScreenTests.cs
@@ -7,12 +7,14 @@ using UnityEngine.TestTools;
 
 public class ListCoursesScreenTests
 {
-
+    /// <summary>
+    /// Setup function to prepare the test environment before each test.
+    /// </summary>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -22,15 +24,26 @@ public class ListCoursesScreenTests
         yield return new WaitForSeconds(0.2f);
     }
 
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_ListCoursesScreenTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test to verify the navigation to the course info screen.
+    /// </summary>
     [UnityTest]
     public IEnumerator GotoCourseInfoTest()
     {
-        var listCoursesScreen = (ListCoursesScreen)GameObject.FindObjectOfType(typeof(ListCoursesScreen));
+        var listCoursesScreen = GameObject.FindObjectOfType<ListCoursesScreen>();
         listCoursesScreen.GotoCourseInfo();
         yield return new WaitForSeconds(0.2f);
 
-        var courseInfo = (CourseActivityScreen)GameObject.FindObjectOfType(typeof(CourseActivityScreen));
+        var courseInfo = GameObject.FindObjectOfType<CourseActivityScreen>();
         Assert.IsNotNull(courseInfo);
     }
 }
-
diff --git a/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs b/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs
new file mode 100644
index 0000000..6a7456a
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs
@@ -0,0 +1,50 @@
+using NUnit.Framework;
+using System.Collections;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+public class ListMinigamesScreenTests
+{
+    /// <summary>
+    /// Setup function to prepare the test environment before each test.
+    /// </summary>
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
+        yield return new WaitForSeconds(0.2f);
+    }
+
+    /// <summary>
+    /// Cleanup after testing.
+    /// </summary>
+    [TearDown]
+    public void TearDown_ListMinigamesScreenTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test to verify the loading of a minigame scene.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator LoadSceneTest()
+    {
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(0);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
+        yield return new WaitForSeconds(0.2f);
+
+        var minigameActivityScreen = GameObject.FindObjectOfType<MinigameActivityScreen>();
+        Assert.IsNotNull(minigameActivityScreen);
+    }
+}
diff --git a/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs.meta b/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs.meta
new file mode 100644
index 0000000..a10083b
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/ListMinigamesScreenTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 72a0b05a29638b84e9cf94f7872f16f9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Common/Tests/PlayMode/MainMenuScreenTests.cs b/Assets/Common/Tests/PlayMode/MainMenuScreenTests.cs
index 51cbc10..f663a10 100644
--- a/Assets/Common/Tests/PlayMode/MainMenuScreenTests.cs
+++ b/Assets/Common/Tests/PlayMode/MainMenuScreenTests.cs
@@ -9,12 +9,14 @@ using UnityEngine.TestTools;
 
 public class MainMenuScreenTests
 {
-
+    /// <summary>
+    /// Setup function to prepare the test environment before each test.
+    /// </summary>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -24,43 +26,101 @@ public class MainMenuScreenTests
         yield return new WaitForSeconds(0.2f);
     }
 
+    /// <summary>
+    /// Cleanup after testing.
+    /// </summary>
+    [TearDown]
+    public void TearDown_MainMenuScreenTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test to verify the transition to the CourseMenuScreen.
+    /// </summary>
     [UnityTest]
     public IEnumerator GotoCoursesTest()
     {
-        var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
         mainMenuScreen.GotoCourses();
         yield return new WaitForSeconds(0.2f);
 
-        var courseMenuScreen = (CourseMenuScreen)GameObject.FindObjectOfType(typeof(CourseMenuScreen));
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
 
         Assert.IsNotNull(courseMenuScreen);
     }
 
+    /// <summary>
+    /// Test to verify the transition to the ListMinigamesScreen.
+    /// </summary>
     [UnityTest]
     public IEnumerator GotoMiniGamesTest()
     {
-        var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
         mainMenuScreen.GotoMinigames();
         yield return new WaitForSeconds(0.2f);
 
-        var listMinigamesScreen = (ListMinigamesScreen)GameObject.FindObjectOfType(typeof(ListMinigamesScreen));
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
         Assert.IsNotNull(listMinigamesScreen);
     }
 
+    /// <summary>
+    /// Test to verify the behavior when the user data is deleted.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator DeletedUserTest()
+    {
+        // Remove the user data file
+        File.Delete(PersistentDataController.PATH);
 
+        SceneManager.LoadScene("Common/Scenes/MainMenuScreen");
+        yield return new WaitForSeconds(0.2f);
 
-    /*    [UnityTest]
-        public IEnumerator GotoSettingsTest()
-        {
-            Arrange
-            SceneManager.LoadScene("Common/Scenes/MainMenuScreen");
+        var userCreationScreen = GameObject.FindObjectOfType<UserCreationScreen>();
+        Assert.IsNotNull(userCreationScreen);
+    }
 
-            yield return new WaitForSeconds(1f);
-            var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
-            mainMenuScreen.GotoSettings();
-            yield return new WaitForSeconds(1f);
+    /// <summary>
+    /// Test to verify the behavior when starting the scene from the Boot scene.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator StartFromBootTest()
+    {
+        SystemController.GetInstance().previousScene = SystemController.GetSceneIndex("Common/Scenes/Boot");
 
-            var minigameActivityScreen = (MinigameActivityScreen)GameObject.FindObjectOfType(typeof(MinigameActivityScreen));
-            Assert.IsNotNull(minigameActivityScreen);
-        }*/
-}
+        SceneManager.LoadScene("Common/Scenes/MainMenuScreen");
+        yield return new WaitForSeconds(0.2f);
+
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        Assert.IsTrue(mainMenuScreen.directorEnterFromBoot.state == UnityEngine.Playables.PlayState.Playing);
+    }
+
+    /// <summary>
+    /// Test to verify the transition to the SettingsScreen.
+    /// </summary>
+    [UnityTest]
+    public IEnumerator GotoSettingsTest()
+    {
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        mainMenuScreen.GotoSettings();
+        yield return new WaitForSeconds(0.2f);
+
+        var settingsScreen = GameObject.FindObjectOfType<SettingsScreen>();
+        Assert.IsNotNull(settingsScreen);
+
+        GameObject backbutton = GameObject.Find("ButtonBack");
+        Assert.IsNotNull(backbutton);
+        backbutton.GetComponent<UnityEngine.UI.Button>().onClick.Invoke();
+    }
+    /// <summary>
+    /// Tests the QuicApplication function of the MainMenuScreen
+    /// </summary>
+    [UnityTest]
+    public IEnumerator QuitAppTest()
+    {
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        mainMenuScreen.QuitApplication();
+        yield return new WaitForSeconds(0.2f);
+
+    }
+}
\ No newline at end of file
diff --git a/Assets/Common/Tests/PlayMode/MinigameActivityScreenTests.cs b/Assets/Common/Tests/PlayMode/MinigameActivityScreenTests.cs
index 5a29d14..3677188 100644
--- a/Assets/Common/Tests/PlayMode/MinigameActivityScreenTests.cs
+++ b/Assets/Common/Tests/PlayMode/MinigameActivityScreenTests.cs
@@ -8,30 +8,96 @@ using UnityEngine.TestTools;
 
 public class MiniGameActivityScreenTests
 {
-
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
         PersistentDataController.GetInstance().Load();
         AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
-        SystemController.GetInstance().LoadNextScene("Common/Scenes/CoursesMenuScreen");
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
         yield return new WaitForSeconds(0.2f);
     }
-
-    [UnityTest]
-    public IEnumerator GotoListOfCoursesTest()
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_MiniGameActivityScreenTests()
     {
-        var courseMenuScreen = (CourseMenuScreen)GameObject.FindObjectOfType(typeof(CourseMenuScreen));
-        courseMenuScreen.GotoListOfCourses();
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test loading the spellingbee minigame
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator GotoSpellingBeeTest()
+    {
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(MinigameIndex.SPELLING_BEE);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
         yield return new WaitForSeconds(0.2f);
 
-        var listCoursesScreen = (ListCoursesScreen)GameObject.FindObjectOfType(typeof(ListCoursesScreen));
-        Assert.IsNotNull(listCoursesScreen);
     }
+    /// <summary>
+    /// Test loading the Hangman minigame
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator GotoHangmanTest()
+    {
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(MinigameIndex.HANGMAN);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
+        yield return new WaitForSeconds(0.2f);
+
+    }
+    /// <summary>
+    /// Test loading the JustSign minigame
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator GotoJustSignTest()
+    {
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(MinigameIndex.JUST_SIGN);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
+        yield return new WaitForSeconds(0.2f);
+
+    }
+
+    /// <summary>
+    /// Check if Progress is loading correctly
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator ProgressLoadTest()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string minigame = "{\"entries\":[],\"minigameIndex\":1,\"latestScores\":[{\"scoreValue\":70,\"time\":\"19/04/2023 22:32:39\"},{\"scoreValue\":55,\"time\":\"20/04/2023 11:50:10\"},{\"scoreValue\":55,\"time\":\"20/04/2023 13:27:15\"}],\"highestScores\":[{\"scoreValue\":70,\"time\":\"19/04/2023 22:32:39\"},{\"scoreValue\":55,\"time\":\"20/04/2023 11:50:10\"},{\"scoreValue\":55,\"time\":\"20/04/2023 13:27:15\"}]}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"Tester0\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[{minigame}],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
+        yield return new WaitForSeconds(0.2f);
+
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(MinigameIndex.HANGMAN);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
+        yield return new WaitForSeconds(0.2f);
+
+    }
+
 }
 
diff --git a/Assets/Common/Tests/PlayMode/MinigameItemTests.cs b/Assets/Common/Tests/PlayMode/MinigameItemTests.cs
new file mode 100644
index 0000000..ce9c600
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/MinigameItemTests.cs
@@ -0,0 +1,57 @@
+using NUnit.Framework;
+using UnityEngine.UI;
+using System.Collections;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+public class MinigameItemTests
+{
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
+        yield return new WaitForSeconds(0.2f);
+    }
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_MinigameItemTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test the callback function of a MinigameItem
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator CallBackTest()
+    {
+        GameObject buttonObject = GameObject.Find("Minigame Item(Clone)");
+        Assert.IsNotNull(buttonObject, "Could not find button object");
+
+        Button button = buttonObject.GetComponent<Button>();
+        Assert.IsNotNull(button, "Button component not found on button object");
+
+        button.onClick.Invoke();
+
+        yield return new WaitForSeconds(0.2f);
+
+        Assert.AreEqual("MinigameActivityScreen", SceneManager.GetActiveScene().name);
+    }
+}
diff --git a/Assets/Common/Tests/PlayMode/MinigameItemTests.cs.meta b/Assets/Common/Tests/PlayMode/MinigameItemTests.cs.meta
new file mode 100644
index 0000000..137842d
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/MinigameItemTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 927ae0c624f71d445b429748394a51ae
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Common/Tests/PlayMode/StartGameTests.cs b/Assets/Common/Tests/PlayMode/StartGameTests.cs
index 24d9d9c..87a0220 100644
--- a/Assets/Common/Tests/PlayMode/StartGameTests.cs
+++ b/Assets/Common/Tests/PlayMode/StartGameTests.cs
@@ -9,11 +9,15 @@ using UnityEngine.TestTools;
 
 public class StartGamesTests
 {
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnityTest]
     public IEnumerator BootWithUsersTest()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -23,20 +27,10 @@ public class StartGamesTests
 
         yield return new WaitForSeconds(1);
 
-        var userCreationScreen = (UserCreationScreen)GameObject.FindObjectOfType(typeof(UserCreationScreen));
-        var bootScreen = (BootScreen)GameObject.FindObjectOfType(typeof(BootScreen));
-        var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
+        var userCreationScreen = GameObject.FindObjectOfType<UserCreationScreen>();
+        var bootScreen = GameObject.FindObjectOfType<BootScreen>();
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
 
-        // yield return Application.RequestUserAuthorization(UserAuthorization.WebCam);
-        // if (Application.HasUserAuthorization(UserAuthorization.WebCam))
-        // {
-        //     Debug.Log("no access");
-        //     Assert.IsNull(userCreationScreen);
-        //     Assert.IsNull(mainMenuScreen);
-        //     Assert.IsNotNull(bootScreen);
-        //     Assert.AreEqual(bootScreen.errorText.text, "Zorg ervoor dat deze applicatie toegang heeft tot je webcam!");
-        // }
-        // else 
         if (0 >= WebCamTexture.devices.Length)
         {
             Assert.IsNull(mainMenuScreen);
@@ -50,7 +44,19 @@ public class StartGamesTests
         }
         Assert.IsNull(userCreationScreen);
     }
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_StartGamesTests()
+    {
+        PersistentDataController.PATH = null;
+    }
 
+    /// <summary>
+    /// Test booting without user
+    /// </summary>
+    /// <returns></returns>
     [UnityTest]
     public IEnumerator BootWithoutUsersTest()
     {
@@ -65,20 +71,10 @@ public class StartGamesTests
 
         yield return new WaitForSeconds(1);
 
-        var userCreationScreen = (UserCreationScreen)GameObject.FindObjectOfType(typeof(UserCreationScreen));
-        var bootScreen = (BootScreen)GameObject.FindObjectOfType(typeof(BootScreen));
-        var mainMenuScreen = (MainMenuScreen)GameObject.FindObjectOfType(typeof(MainMenuScreen));
+        var userCreationScreen = GameObject.FindObjectOfType<UserCreationScreen>();
+        var bootScreen = GameObject.FindObjectOfType<BootScreen>();
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
 
-        // yield return Application.RequestUserAuthorization(UserAuthorization.WebCam);
-        // if (Application.HasUserAuthorization(UserAuthorization.WebCam))
-        // {
-        //     Debug.Log("no access");
-        //     Assert.IsNull(userCreationScreen);
-        //     Assert.IsNull(mainMenuScreen);
-        //     Assert.IsNotNull(bootScreen);
-        //     Assert.AreEqual(bootScreen.errorText.text, "Zorg ervoor dat deze applicatie toegang heeft tot je webcam!");
-        // }
-        // else 
         if (0 >= WebCamTexture.devices.Length)
         {
             Assert.IsNull(userCreationScreen);
diff --git a/Assets/Common/Tests/PlayMode/ThemeItemTests.cs b/Assets/Common/Tests/PlayMode/ThemeItemTests.cs
new file mode 100644
index 0000000..862daa4
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/ThemeItemTests.cs
@@ -0,0 +1,63 @@
+using NUnit.Framework;
+using UnityEngine.UI;
+using System.Collections;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+public class ThemeItemTests
+{
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
+        yield return new WaitForSeconds(0.2f);
+    }
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_ThemeItemTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+    /// <summary>
+    /// Test the callback function of a ThemeItem
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator CallBackTest()
+    {
+        var listMinigamesScreen = GameObject.FindObjectOfType<ListMinigamesScreen>();
+        listMinigamesScreen.minigameList.SetCurrentMinigame(MinigameIndex.SPELLING_BEE);
+        listMinigamesScreen.LoadScene("Common/Scenes/MinigameActivityScreen");
+        yield return new WaitForSeconds(0.2f);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/ThemeSelectionScreen");
+        yield return new WaitForSeconds(0.2f);
+
+        GameObject buttonObject = GameObject.Find("Theme Item(Clone)");
+        Assert.IsNotNull(buttonObject, "Could not find button object");
+
+        Button button = buttonObject.GetComponent<Button>();
+        Assert.IsNotNull(button, "Button component not found on button object");
+
+        button.onClick.Invoke();
+
+        yield return new WaitForSeconds(0.2f);
+
+        Assert.AreEqual("SpellingBeeGame", SceneManager.GetActiveScene().name); 
+    }
+}
diff --git a/Assets/Common/Tests/PlayMode/ThemeItemTests.cs.meta b/Assets/Common/Tests/PlayMode/ThemeItemTests.cs.meta
new file mode 100644
index 0000000..86d04ff
--- /dev/null
+++ b/Assets/Common/Tests/PlayMode/ThemeItemTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2fc837db4edec5b478e57ed3fd46746b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Common/Tests/PlayMode/UserButtonTests.cs b/Assets/Common/Tests/PlayMode/UserButtonTests.cs
index 772c00b..bfdbbbb 100644
--- a/Assets/Common/Tests/PlayMode/UserButtonTests.cs
+++ b/Assets/Common/Tests/PlayMode/UserButtonTests.cs
@@ -1,19 +1,21 @@
-using NUnit.Framework;
+using UnityEditor;
 using System.Collections;
 using System.IO;
-using UnityEditor;
 using UnityEngine;
 using UnityEngine.TestTools;
-
+using NUnit.Framework;
 
 public class UserButtonTests
 {
-
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
     [UnitySetUp]
     public IEnumerator SetupFunction()
     {
         string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
-        string oneUser = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
 
         File.WriteAllText(path, oneUser);
         PersistentDataController.PATH = path;
@@ -23,26 +25,73 @@ public class UserButtonTests
         yield return new WaitForSeconds(0.2f);
     }
 
-    /*    [UnityTest]
-        public IEnumerator OpenProgressCallbackTest()
-        {
-            var userButton = (UserButton)GameObject.FindObjectOfType(typeof(UserButton));
-            userButton.OpenProgressCallback();
-            yield return new WaitForSeconds(0.2f);
-
-            var listCoursesScreen = (ListCoursesScreen)GameObject.FindObjectOfType(typeof(ListCoursesScreen));
-            Assert.IsNotNull(listCoursesScreen);
-        }*/
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_UserButtonTests()
+    {
+        PersistentDataController.PATH = null;
+    }
 
+    /// <summary>
+    /// Test the ChangeUserCallback on the UserButton
+    /// </summary>
+    /// <returns></returns>
     [UnityTest]
     public IEnumerator ChangeUserCallbackTest()
     {
-        var userButton = (UserButton)GameObject.FindObjectOfType(typeof(UserButton));
+        var userButton = GameObject.FindObjectOfType<UserButton>();
         userButton.ChangeUserCallback();
         yield return new WaitForSeconds(0.2f);
 
-        var changeUserScreen = (ChangeUserScreen)GameObject.FindObjectOfType(typeof(ChangeUserScreen));
+        var changeUserScreen = GameObject.FindObjectOfType<ChangeUserScreen>();
         Assert.IsNotNull(changeUserScreen);
+        yield return null;
+    }
+    /// <summary>
+    /// Test if the username and avatar are correctly loaded
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator CorrectUsernameAndAvatarTest()
+    {
+        var userButton = GameObject.FindObjectOfType<UserButton>();
+
+        Assert.AreEqual("TEST", userButton.username.text, "Username is not correctly displayed.");
+        Assert.IsNotNull(userButton.avatar.sprite, "Avatar sprite is null.");
+
+        yield return null;
+    }
+    /// <summary>
+    /// Test the transition to UserProgressScreen
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator ChangeSceneToUserProgressScreenTest()
+    {
+        var userButton = GameObject.FindObjectOfType<UserButton>();
+
+        userButton.OpenProgressCallback();
+        yield return new WaitForSeconds(0.2f);
+
+        var userProgressScreen = GameObject.FindObjectOfType<UserProgressScreen>();
+        Assert.IsNotNull(userProgressScreen, "Scene was not correctly changed to UserProgressScreen.");
+    }
+    /// <summary>
+    /// Test is the user dropdown menu works correctly
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator ToggleDropdownTest()
+    {
+        var userButton = GameObject.FindObjectOfType<UserButton>();
+
+        bool initialActiveState = userButton.dropdownBox.activeSelf;
+        userButton.ToggleDropdown();
+
+        Assert.AreNotEqual(initialActiveState, userButton.dropdownBox.activeSelf, "Dropdown box active state was not toggled.");
+
+        yield return null;
     }
 }
-
diff --git a/Assets/Courses/Scripts/CoursesController.cs b/Assets/Courses/Scripts/CoursesController.cs
index b7b6d17..395b5a9 100644
--- a/Assets/Courses/Scripts/CoursesController.cs
+++ b/Assets/Courses/Scripts/CoursesController.cs
@@ -161,6 +161,16 @@ public class CoursesController : AbstractFeedback
     /// </summary>
     private GameObject previousPanel = null;
 
+    /// <summary>
+    /// Boolean used to make a test possible
+    /// </summary>
+    private bool corruptPanelId = false;
+
+    /// <summary>
+    /// Corrupted PanelID Value 
+    /// </summary>
+    private int CorruptedPanelIDValue = 999;
+
     /// <summary>
     /// This function is called when the script is initialised.
     /// It inactivatis the popup, finds a webcam to use and links it via the WebcamTexture to the display RawImage.
@@ -319,7 +329,13 @@ public class CoursesController : AbstractFeedback
     /// <returns>Reference to the GameObject of the panel</returns>
     private GameObject SetupPanel()
     {
-        (currentWordIndex, panelId) = FetchSign().ToValueTuple();
+        if (corruptPanelId == true)
+        {   
+            (currentWordIndex, panelId) = (1, CorruptedPanelIDValue);
+        } else
+        {
+            (currentWordIndex, panelId) = FetchSign().ToValueTuple();
+        }
         switch (panelId)
         {
             case 0:
@@ -413,9 +429,11 @@ public class CoursesController : AbstractFeedback
         if (currentWordIndex < course.theme.learnables.Count && panelId != 1 && !hasAnswered)
         {
             // Get current sign
+          
             Learnable sign = course.theme.learnables[currentWordIndex];
             string currentSign = sign.name.ToUpper().Replace(" ", "-");
 
+
             // Get the predicted sign
             if (signPredictor != null && signPredictor.learnableProbabilities != null &&
                 currentSign != null && signPredictor.learnableProbabilities.ContainsKey(currentSign))
@@ -567,4 +585,60 @@ public class CoursesController : AbstractFeedback
         UserList.Save();
         SystemController.GetInstance().BackToPreviousScene();
     }
+    
+    /// <summary>
+    /// Returns panelId for testing
+    /// </summary>
+    /// <returns></returns>
+    public int GetPanelId()
+    {
+        return panelId;
+    }
+    /// <summary>
+    /// Returns currentSign for testing
+    /// </summary>
+    /// <returns></returns>
+    public string GetCurrentSign()
+    {
+        Learnable sign = course.theme.learnables[currentWordIndex];
+        return sign.name.ToUpper().Replace(" ", "-");
+    }
+    /// <summary>
+    /// Used for testing an out of bounds PanelId
+    /// </summary>
+    /// <returns></returns>
+    public void CorruptPanelID()
+    {
+        corruptPanelId = true;
+    }
+
+    /// <summary>
+    /// Needed to be able to test an out of bounds PanelId
+    /// </summary>
+    /// <returns></returns>
+    public IEnumerator CallSetupPanel()
+    {
+        yield return SetupPanel();
+    }
+
+    /// <summary>
+    /// Needed to be able to test an out of bounds PanelId
+    /// </summary>
+    /// <returns></returns>
+    public void SetFeedbackProgress()
+    {
+        feedbackProgress.value = 0.0f;
+    }
+
+    /// <summary>
+    /// Open multiple choice panel for testing
+    /// </summary>
+    public IEnumerator SummonMultipleChoice()
+    {
+        CorruptPanelID();
+        CorruptedPanelIDValue = 1;
+        yield return CRNextSign();
+    }
+
+
 }
diff --git a/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs b/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs
new file mode 100644
index 0000000..1b6eb0f
--- /dev/null
+++ b/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs
@@ -0,0 +1,366 @@
+using NUnit.Framework;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+[TestFixture]
+public class CoursesControllerTests
+{
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SceneManager.LoadScene("Common/Scenes/MainMenuScreen");
+        yield return null;
+
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        mainMenuScreen.GotoCourses();
+        yield return null;
+
+    }
+
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_CoursesControllerTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+    /// <summary>
+    /// Function used to Spoof the sign predictor. The it uses 0f as certainty so the sign is "perfect".
+    /// </summary>
+    /// <param name="sign"></param>
+    /// <param name="signPredictor"></param>
+    /// <returns></returns>
+    public IEnumerator SignLetter(string sign, SignPredictor signPredictor)
+    {
+        signPredictor.learnableProbabilities = new Dictionary<string, float>();
+        // Loop through all capital letters of the alphabet
+        for (char c = 'A'; c <= 'Z'; c++)
+        {
+            string letter = c.ToString();
+
+            // If the current letter is the input sign, set its value to 0.
+            // Otherwise, set it to 20.
+            signPredictor.learnableProbabilities[letter] = letter == sign ? 0f : 20f;
+        }
+
+        foreach (Listener listener in signPredictor.listeners)
+        {
+            yield return listener.ProcessIncomingCall();
+        }
+    }
+    
+    /// <summary>
+    /// Simulates a little playtrough of a course
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator PlaytroughTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        int counter = 0;
+        while (counter < 100)
+        {
+            if (coursesController.GetPanelId() == 0 || coursesController.GetPanelId() == 2)
+            {
+                yield return SignLetter(coursesController.GetCurrentSign(), signPredictor);
+            }
+            else
+            {
+                GameObject buttonObject = GameObject.Find("Choice Fingerspelling(Clone)");
+                Assert.IsNotNull(buttonObject);
+                Button button = buttonObject.GetComponent<Button>();
+                button.onClick.Invoke();
+            }
+            yield return new WaitForSeconds(1.0f);
+            counter++;
+        }
+
+        yield return new WaitForSeconds(2.0f);
+        coursesController.FinishCourse();
+        coursesController.ReturnToActivityScreen();
+        yield return new WaitForSeconds(1.0f);
+    }
+    /// <summary>
+    /// Tests a preview course
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator PreviewTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(CourseIndex.CLOTHING);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+        Assert.AreEqual(coursesController.GetPanelId(), 1);
+    }
+
+    /// <summary>
+    /// Tests the finisihing of a course
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator FinishedCourseTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(CourseIndex.FINGERSPELLING);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+        var course = coursesController.courselist.courses[coursesController.courselist.currentCourseIndex];
+        var maxWords = course.theme.learnables.Count;
+        User user = UserList.GetCurrentUser();
+        var progress = user.GetCourseProgress(CourseIndex.FINGERSPELLING);
+        progress.completedLearnables = maxWords;
+
+        coursesController.NextSign();
+    }
+
+    /// <summary>
+    /// Tests what happens when a panel is being summoned with a none existing ID
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator BrokenPanelIDTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(CourseIndex.FINGERSPELLING);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+        coursesController.CorruptPanelID();
+        yield return coursesController.CallSetupPanel();
+        yield return new WaitForSeconds(0.2f);
+    }
+    /// <summary>
+    /// Tests what happens when the sign is correct but not certain enough
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator UnconfidentTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        Course course = coursesController.courselist.courses[coursesController.courselist.currentCourseIndex];
+        Learnable sign = course.theme.learnables[0];
+
+        string signletter = "A";
+        signPredictor.learnableProbabilities = new Dictionary<string, float>();
+        for (char c = 'A'; c <= 'Z'; c++)
+        {
+            string letter = c.ToString();
+            signPredictor.learnableProbabilities[letter] = letter == signletter ? sign.thresholdDistance * 1.2f : 20f;
+        }
+        foreach (Listener listener in signPredictor.listeners)
+        {
+            yield return listener.ProcessIncomingCall();
+        }
+
+        yield return new WaitForSeconds(1.0f);
+        Assert.AreEqual(coursesController.GetCurrentSign(), "A");
+    }
+    /// <summary>
+    /// Test what happens when an incorrect sign is signed
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator IncorrectSignTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        yield return SignLetter("B", signPredictor);
+        yield return new WaitForSeconds(1.0f);
+        Assert.AreEqual(coursesController.GetCurrentSign(), "A");
+    }
+    /// <summary>
+    /// Test what happens when there is no sign being signed
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator NoSignTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        yield return SignLetter("-", signPredictor);
+        yield return new WaitForSeconds(1.0f);
+        Assert.AreEqual(coursesController.GetCurrentSign(), "A");
+    }
+    /// <summary>
+    /// Tests what happens when a wrong sign is performed twice but with a long enough interval
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator TwoWrongFastTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        Course course = coursesController.courselist.courses[coursesController.courselist.currentCourseIndex];
+        Learnable sign = course.theme.learnables[0];
+
+        yield return SignLetter("B", signPredictor);
+
+        yield return new WaitForSeconds(2.1f);
+
+        yield return SignLetter("B", signPredictor);
+
+        Assert.AreEqual(coursesController.GetCurrentSign(), "A");
+    }
+    /// <summary>
+    /// Tests what happens when the sign can not be processed but the Feedback is not Null
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator FeedbackNotNullTest()
+    {
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        var signPredictor = GameObject.FindObjectOfType<SignPredictor>();
+        Assert.IsNotNull(signPredictor);
+
+        signPredictor.learnableProbabilities = null;
+        coursesController.SetFeedbackProgress();
+
+        foreach (Listener listener in signPredictor.listeners)
+        {
+            yield return listener.ProcessIncomingCall();
+        }
+    }
+}
+
diff --git a/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs.meta b/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs.meta
new file mode 100644
index 0000000..e27d815
--- /dev/null
+++ b/Assets/Courses/Tests/PlayMode/CourseControllerTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 08f61c7671fe3c64687258bc3f82f38f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Courses/Tests/PlayMode/CoursesPlayMode.asmdef b/Assets/Courses/Tests/PlayMode/CoursesPlayMode.asmdef
index e9a265f..847f18e 100644
--- a/Assets/Courses/Tests/PlayMode/CoursesPlayMode.asmdef
+++ b/Assets/Courses/Tests/PlayMode/CoursesPlayMode.asmdef
@@ -4,7 +4,15 @@
     "references": [
         "UnityEngine.TestRunner",
         "UnityEditor.TestRunner",
-        "CourseScripts"
+        "CourseScripts",
+        "CommonScripts",
+        "InterfacesScripts",
+        "ArchitectureScripts",
+        "AccountsScripts",
+        "MediaPipeUnityScripts",
+        "SignPredictor",
+        "SignPredictorInterfaces",
+        ""
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Courses/Tests/PlayMode/PaneTests.cs b/Assets/Courses/Tests/PlayMode/PaneTests.cs
new file mode 100644
index 0000000..9c5cbb8
--- /dev/null
+++ b/Assets/Courses/Tests/PlayMode/PaneTests.cs
@@ -0,0 +1,93 @@
+using NUnit.Framework;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+[TestFixture]
+public class PaneTests
+{
+    /// <summary>
+    /// Setup the environment before each test
+    /// </summary>
+    /// <returns></returns>
+    [UnitySetUp]
+    public IEnumerator SetupFunction()
+    {
+        string path = $"{Application.persistentDataPath}/wesign_unit_test.json";
+        string oneUser = $"{{\"version\":1027,\"users\":[{{\"entries\":[],\"username\":\"TEST\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":0,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+
+        File.WriteAllText(path, oneUser);
+        PersistentDataController.PATH = path;
+        PersistentDataController.GetInstance().Load();
+        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
+        SceneManager.LoadScene("Common/Scenes/MainMenuScreen");
+        yield return null;
+
+        var mainMenuScreen = GameObject.FindObjectOfType<MainMenuScreen>();
+        mainMenuScreen.GotoCourses();
+        yield return null;
+
+        var courseMenuScreen = GameObject.FindObjectOfType<CourseMenuScreen>();
+        var courseList = courseMenuScreen.courseList;
+        Assert.IsNotNull(courseList, "Course was not started.");
+        courseList.SetCurrentCourse(0);
+        SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
+        yield return null;
+
+        var courseActivityScreen = GameObject.FindObjectOfType<CourseActivityScreen>();
+        Assert.IsNotNull(courseActivityScreen);
+        courseActivityScreen.StartCourse();
+        yield return null;
+
+    }
+    /// <summary>
+    /// Cleanup after testing
+    /// </summary>
+    [TearDown]
+    public void TearDown_PaneTests()
+    {
+        PersistentDataController.PATH = null;
+    }
+
+    /// <summary>
+    /// Test pausing/resuming the video in all course panels
+    /// </summary>
+    /// <returns></returns>
+    [UnityTest]
+    public IEnumerator PlayPauseTest()
+    {
+        var coursesController = GameObject.FindObjectOfType<CoursesController>();
+        Assert.IsNotNull(coursesController);
+
+        yield return null;
+
+        PanelWithVideoAndImage panel = GameObject.FindObjectOfType<PanelWithVideoAndImage>();
+        Assert.IsNotNull(panel);
+
+        panel.TogglePlayPause();
+        yield return null;
+        Assert.IsTrue(panel.videoPlayer.isPlaying == false);
+        panel.TogglePlayPause();
+        yield return null;
+        Assert.IsTrue(panel.videoPlayer.isPlaying == true);
+
+        yield return coursesController.SummonMultipleChoice();
+
+        PanelMultipleChoice panel2 = GameObject.FindObjectOfType<PanelMultipleChoice>();
+        Assert.IsNotNull(panel2);
+
+        panel2.TogglePlayPause();
+        yield return null;
+        Assert.IsTrue(panel2.videoPlayer.isPlaying == false);
+        panel2.TogglePlayPause();
+        yield return null;
+        Assert.IsTrue(panel2.videoPlayer.isPlaying == true);
+        yield return null;
+
+    }
+}
diff --git a/Assets/Courses/Tests/PlayMode/PaneTests.cs.meta b/Assets/Courses/Tests/PlayMode/PaneTests.cs.meta
new file mode 100644
index 0000000..9c464ae
--- /dev/null
+++ b/Assets/Courses/Tests/PlayMode/PaneTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e93be4ce8a774984b8f79e5b6828780f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: