diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 50b9f87a..0e5beff1 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -112,8 +112,9 @@ void JFJochStateMachine::CalibrateDetector(std::unique_lock<std::mutex> &ul) {
         throw;
     }
     SetState(JFJochState::Idle, "Calibration sequence done", BrokerStatus::MessageSeverity::Success);
-
-    logger.Info("Pedestal sequence done");
+    logger.Info("Calibration sequence done");
+    ul.unlock(); // Notify all outside of mutex
+    c.notify_all();
 }
 
 void JFJochStateMachine::TakeDarkMaskInternal(std::unique_lock<std::mutex> &ul) {
diff --git a/tests/JFJochStateMachineTest.cpp b/tests/JFJochStateMachineTest.cpp
index 1aba3055..c27d2c1f 100644
--- a/tests/JFJochStateMachineTest.cpp
+++ b/tests/JFJochStateMachineTest.cpp
@@ -146,7 +146,7 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Gain") {
 }
 
 TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
-    Logger logger("JFJochBrokerService_StorageCells");
+    Logger logger("JFJochStateMachine_AddDetectorSetup_Multiple");
     JFJochServices services(logger);
     DiffractionExperiment experiment;