diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/DisclaimerOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/DisclaimerOperationTests.cs
index 593f68a2..8a5318e6 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Operations/DisclaimerOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Operations/DisclaimerOperationTests.cs
@@ -42,21 +42,23 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Perform_MustShowDisclaimerWhenProctoringEnabled()
 		{
-			var disclaimerShown = false;
+			var count = 0;
+
+			settings.Proctoring.JitsiMeet.Enabled = true;
+			settings.Proctoring.ScreenProctoring.Enabled = true;
 
-			settings.Proctoring.Enabled = true;
 			sut.ActionRequired += (args) =>
 			{
 				if (args is MessageEventArgs m)
 				{
-					disclaimerShown = true;
+					count++;
 					m.Result = MessageBoxResult.Ok;
 				}
 			};
 
 			var result = sut.Perform();
 
-			Assert.IsTrue(disclaimerShown);
+			Assert.AreEqual(2, count);
 			Assert.AreEqual(OperationResult.Success, result);
 		}
 
@@ -65,7 +67,9 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		{
 			var disclaimerShown = false;
 
-			settings.Proctoring.Enabled = true;
+			settings.Proctoring.JitsiMeet.Enabled = true;
+			settings.Proctoring.ScreenProctoring.Enabled = false;
+
 			sut.ActionRequired += (args) =>
 			{
 				if (args is MessageEventArgs m)
@@ -75,7 +79,16 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 				}
 			};
 
-			var result = sut.Perform();
+			var result = sut.Repeat();
+
+			Assert.IsTrue(disclaimerShown);
+			Assert.AreEqual(OperationResult.Aborted, result);
+
+			disclaimerShown = false;
+			settings.Proctoring.JitsiMeet.Enabled = false;
+			settings.Proctoring.ScreenProctoring.Enabled = true;
+
+			result = sut.Repeat();
 
 			Assert.IsTrue(disclaimerShown);
 			Assert.AreEqual(OperationResult.Aborted, result);
@@ -105,21 +118,23 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Repeat_MustShowDisclaimerWhenProctoringEnabled()
 		{
-			var disclaimerShown = false;
+			var count = 0;
+
+			settings.Proctoring.JitsiMeet.Enabled = true;
+			settings.Proctoring.ScreenProctoring.Enabled = true;
 
-			settings.Proctoring.Enabled = true;
 			sut.ActionRequired += (args) =>
 			{
 				if (args is MessageEventArgs m)
 				{
-					disclaimerShown = true;
+					count++;
 					m.Result = MessageBoxResult.Ok;
 				}
 			};
 
-			var result = sut.Repeat();
+			var result = sut.Perform();
 
-			Assert.IsTrue(disclaimerShown);
+			Assert.AreEqual(2, count);
 			Assert.AreEqual(OperationResult.Success, result);
 		}
 
@@ -128,7 +143,9 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		{
 			var disclaimerShown = false;
 
-			settings.Proctoring.Enabled = true;
+			settings.Proctoring.JitsiMeet.Enabled = true;
+			settings.Proctoring.ScreenProctoring.Enabled = false;
+
 			sut.ActionRequired += (args) =>
 			{
 				if (args is MessageEventArgs m)
@@ -142,6 +159,15 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 
 			Assert.IsTrue(disclaimerShown);
 			Assert.AreEqual(OperationResult.Aborted, result);
+
+			disclaimerShown = false;
+			settings.Proctoring.JitsiMeet.Enabled = false;
+			settings.Proctoring.ScreenProctoring.Enabled = true;
+
+			result = sut.Repeat();
+
+			Assert.IsTrue(disclaimerShown);
+			Assert.AreEqual(OperationResult.Aborted, result);
 		}
 
 		[TestMethod]
diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/ProctoringWorkaroundOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ProctoringWorkaroundOperationTests.cs
index ac8f3c5c..7a366fe8 100644
--- a/SafeExamBrowser.Runtime.UnitTests/Operations/ProctoringWorkaroundOperationTests.cs
+++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ProctoringWorkaroundOperationTests.cs
@@ -40,7 +40,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Perform_MustSwitchToDisableExplorerShellIfProctoringActive()
 		{
-			settings.Proctoring.Enabled = true;
+			settings.Proctoring.JitsiMeet.Enabled = true;
 			settings.Security.KioskMode = KioskMode.CreateNewDesktop;
 
 			var result = sut.Perform();
@@ -52,7 +52,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Perform_MustDoNothingIfProctoringNotActive()
 		{
-			settings.Proctoring.Enabled = false;
+			settings.Proctoring.JitsiMeet.Enabled = false;
 			settings.Security.KioskMode = KioskMode.None;
 
 			var result = sut.Perform();
@@ -64,7 +64,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Repeat_MustSwitchToDisableExplorerShellIfProctoringActive()
 		{
-			settings.Proctoring.Enabled = true;
+			settings.Proctoring.JitsiMeet.Enabled = true;
 			settings.Security.KioskMode = KioskMode.CreateNewDesktop;
 
 			var result = sut.Repeat();
@@ -76,7 +76,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Repeat_MustDoNothingIfProctoringNotActive()
 		{
-			settings.Proctoring.Enabled = false;
+			settings.Proctoring.JitsiMeet.Enabled = false;
 			settings.Security.KioskMode = KioskMode.None;
 
 			var result = sut.Repeat();
@@ -88,7 +88,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations
 		[TestMethod]
 		public void Revert_MustDoNothing()
 		{
-			settings.Proctoring.Enabled = true;
+			settings.Proctoring.JitsiMeet.Enabled = true;
 			settings.Security.KioskMode = KioskMode.None;
 
 			var result = sut.Revert();