diff --git a/ophyd_devices/sim/sim_camera.py b/ophyd_devices/sim/sim_camera.py
index 48891e8..71fa80c 100644
--- a/ophyd_devices/sim/sim_camera.py
+++ b/ophyd_devices/sim/sim_camera.py
@@ -136,6 +136,7 @@ class SimCamera(PSIDeviceBase, SimCameraControl):
 
         def complete_cam():
             """Complete the camera acquisition."""
+            self.h5_writer.on_complete()
             self._run_subs(
                 sub_type=self.SUB_FILE_EVENT,
                 file_path=self.file_path,
diff --git a/ophyd_devices/utils/psi_device_base_utils.py b/ophyd_devices/utils/psi_device_base_utils.py
index d202dc9..dcff133 100644
--- a/ophyd_devices/utils/psi_device_base_utils.py
+++ b/ophyd_devices/utils/psi_device_base_utils.py
@@ -59,7 +59,7 @@ class TaskStatus(DeviceStatus):
         self._state = TaskState(value)
 
     @property
-    def task_id(self) -> bool:
+    def task_id(self) -> str:
         """Get the task ID"""
         return self._task_id
 
diff --git a/tests/test_simulation.py b/tests/test_simulation.py
index 971fd62..beb6284 100644
--- a/tests/test_simulation.py
+++ b/tests/test_simulation.py
@@ -549,7 +549,7 @@ def test_stage_camera_proxy_image_shape(
     test_shape = (102, 77)
     camera.image_shape.set(test_shape).wait()
     proxy.stage()
-    image = camera.image.get()
+    image: np.ndarray = camera.image.get()
     assert image.shape == (*reversed(test_shape), 3)
 
 
@@ -595,6 +595,11 @@ def test_cam_stage_h5writer(camera):
 
 def test_cam_complete(camera):
     """Test the complete method of SimCamera."""
+    finished_event = threading.Event()
+
+    def finished_cb():
+        finished_event.set()
+
     with mock.patch.object(camera, "h5_writer") as mock_h5_writer:
         status = camera.complete()
         status_wait(status)
@@ -603,7 +608,8 @@ def test_cam_complete(camera):
         assert mock_h5_writer.on_complete.call_count == 0
         camera.write_to_disk.put(True)
         status = camera.complete()
-        status_wait(status)
+        status.add_callback(finished_cb)
+        finished_event.wait()
         assert mock_h5_writer.on_complete.call_count == 1