diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
index bb723318..ce57a7f8 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
@@ -8,7 +8,6 @@
 
 package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -47,7 +46,6 @@ public class SEBClientPingBatchService implements SEBClientPingService {
     private final Set<String> pingKeys = new HashSet<>();
     private final Map<String, String> pings = new ConcurrentHashMap<>();
     private final Map<String, String> instructions = new ConcurrentHashMap<>();
-    private final Set<String> confirmedInstructions = Collections.synchronizedSet(new HashSet<>());
 
     private ScheduledFuture<?> scheduleAtFixedRate = null;
 
@@ -149,7 +147,7 @@ public class SEBClientPingBatchService implements SEBClientPingService {
             log.error("Failed to get ClientConnectionDataInternal for: {}", connectionToken);
         }
 
-        if (instructionConfirm != StringUtils.EMPTY) {
+        if (StringUtils.isNotBlank(instructionConfirm)) {
             this.sebClientInstructionService.confirmInstructionDone(connectionToken, instructionConfirm);
         }
 
diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties
index e483adf8..721587a1 100644
--- a/src/main/resources/config/application-dev-ws.properties
+++ b/src/main/resources/config/application-dev-ws.properties
@@ -63,6 +63,7 @@ management.endpoints.web.base-path=/management
 management.endpoints.web.exposure.include=logfile,loggers,jolokia
 management.endpoints.web.path-mapping.jolokia=jmx
 
+sebserver.feature.seb.screenProctoring.bundled=true
 sebserver.feature.seb.screenProctoring.bundled.url=localhost:8090
 sebserver.feature.seb.screenProctoring.bundled.clientId=sebserverClient
 sebserver.feature.seb.screenProctoring.bundled.sebserveraccount.username=SEBServerAPIAccount
\ No newline at end of file
diff --git a/src/main/resources/config/application-ws.properties b/src/main/resources/config/application-ws.properties
index 1ca60782..f518e5ee 100644
--- a/src/main/resources/config/application-ws.properties
+++ b/src/main/resources/config/application-ws.properties
@@ -47,7 +47,6 @@ sebserver.webservice.http.external.port=
 sebserver.webservice.http.redirect.gui=/gui
 sebserver.webservice.ping.service.strategy=BLOCKING
 
-
 ### Open API Documentation
 springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index 6c98d938..ab8a6782 100644
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -23,6 +23,7 @@ spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.platform=test
 spring.flyway.enabled=false
 
+sebserver.webservice.ping.service.strategy=BLOCKING
 sebserver.init.adminaccount.gen-on-init=false
 sebserver.webservice.http.external.scheme=http
 sebserver.webservice.http.redirect.gui=/gui
@@ -45,4 +46,6 @@ sebserver.webservice.api.exam.indicator.name=Ping
 sebserver.webservice.api.exam.indicator.type=LAST_PING
 sebserver.webservice.api.exam.indicator.color=b4b4b4
 sebserver.webservice.api.exam.indicator.thresholds=[{"value":5000.0,"color":"22b14c"},{"value":10000.0,"color":"ff7e00"},{"value":15000.0,"color":"ed1c24"}]
-sebserver.webservice.master.delay.threshold=1000
+sebserver.webservice.master.delay.threshold=1000
+
+sebserver.feature.seb.screenProctoring.bundled=false
\ No newline at end of file