@@ -2070,7 +2070,6 @@ async def operation_handle_fn() -> OutputT:
                 if self._cancel_requested:
                     raise
 
-
     #### Miscellaneous helpers ####
     # These are in alphabetical order.
 
 
@@ -130,12 +130,14 @@
     assert_pending_activity_exists_eventually,
     assert_task_fail_eventually,
     assert_workflow_exists_eventually,
+    async_wait_for_pause_event,
     ensure_search_attributes_present,
     find_free_port,
     get_pending_activity_info,
     new_worker,
     pause_and_assert,
     unpause_and_assert,
+    wait_for_pause_event,
     workflow_update_exists,
 )
 from tests.helpers.cache_eviction import (
@@ -943,7 +945,7 @@ async def run(self, params: CancelActivityWorkflowParams) -> None:
             self._activity_result = await handle
         except ActivityError as err:
             self._activity_result = f"Error: {err.cause.__class__.__name__}"
-        # TODO(cretz): Remove when https://github.com/temporalio/sdk-core/issues/323 is fixed
+        # TODO(cretz): Remove when https://github.com/temporalio/sdk-rust/issues/323 is fixed
         except CancelledError as err:
             self._activity_result = f"Error: {err.__class__.__name__}"
         # Wait forever
@@ -2479,7 +2481,7 @@ async def test_workflow_dataclass_typed(client: Client, env: WorkflowEnvironment
     # TODO(cretz): Fix
     if env.supports_time_skipping:
         pytest.skip(
-            "Java test server: https://github.com/temporalio/sdk-core/issues/390"
+            "Java test server: https://github.com/temporalio/sdk-rust/issues/390"
         )
     async with new_worker(
         client, DataClassTypedWorkflow, activities=[data_class_typed_activity]
@@ -7295,7 +7297,7 @@ async def test_workflow_deadlock_interruptible(client: Client):
     # TODO(cretz): Improve this test and other deadlock/eviction tests by
     # checking slot counts with Core. There are a couple of bugs where used slot
     # counts are off by one and slots are released before eviction (see
-    # https://github.com/temporalio/sdk-core/issues/894).
+    # https://github.com/temporalio/sdk-rust/issues/894).
 
     # This worker used to not be able to shutdown because we hung evictions on
     # deadlock
@@ -7744,7 +7746,7 @@ async def test_activity_benign_error_not_logged(client: Client):
             assert isinstance(err.value.cause.cause, ApplicationError)
             # Assert the expected category
             assert err.value.cause.cause.category == ApplicationErrorCategory.BENIGN
-            assert capturer.find_log("Completing activity as failed") is None
+            assert capturer.find_log("Completing activity as failed") == None
 
             # Run with non-benign error
             with pytest.raises(WorkflowFailureError) as err:
@@ -7762,7 +7764,7 @@ async def test_activity_benign_error_not_logged(client: Client):
             assert (
                 err.value.cause.cause.category == ApplicationErrorCategory.UNSPECIFIED
             )
-            assert capturer.find_log("Completing activity as failed") is not None
+            assert capturer.find_log("Completing activity as failed") != None
 
 
 async def test_workflow_missing_local_activity(client: Client):
@@ -7831,6 +7833,7 @@ async def heartbeat_activity(
     except (CancelledError, asyncio.CancelledError) as err:
         if not catch_err:
             raise err
+        await async_wait_for_pause_event(activity.info().activity_id)
         return activity.cancellation_details()
     finally:
         activity.heartbeat("finally-complete")
@@ -7850,6 +7853,7 @@ def sync_heartbeat_activity(
     except (CancelledError, asyncio.CancelledError) as err:
         if not catch_err:
             raise err
+        wait_for_pause_event(activity.info().activity_id)
         return activity.cancellation_details()
     finally:
         activity.heartbeat("finally-complete")
@@ -8040,8 +8044,8 @@ async def check_heartbeat_details_exist(
 
             # Check workflow complete
             result = await handle.result()
-            assert result[0] is None
-            assert result[1] is None
+            assert result[0] == None
+            assert result[1] == None
 
 
 @activity.defn