diff --git a/services/node-services/src/cancel_test.ts b/services/node-services/src/cancel_test.ts
index e99598f4..3c3eb77a 100644
--- a/services/node-services/src/cancel_test.ts
+++ b/services/node-services/src/cancel_test.ts
@@ -29,7 +29,7 @@ export class CancelTestService implements ICancelTestService {
         const ctx = restate.useContext(this);
         const isCanceled = await ctx.get<boolean>("canceled") ?? false;
 
-        return Response.create({ isCanceled: isCanceled });
+        return { isCanceled: isCanceled };
     }
 
     async startTest(request: BlockingRequest): Promise<Empty> {
@@ -46,7 +46,7 @@ export class CancelTestService implements ICancelTestService {
             }
         }
 
-        return Empty.create({});
+        return {};
     }
 
 }
@@ -77,10 +77,10 @@ export class BlockingService implements IBlockingService {
             }
         }
 
-        return Empty.create({});
+        return {};
     }
 
     async isUnlocked(request: Empty): Promise<Empty> {
-        return Empty.create({});
+        return {};
     }
 }
\ No newline at end of file
diff --git a/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt b/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt
index 525fd08a..c6e0281c 100644
--- a/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt
+++ b/tests/src/test/kotlin/dev/restate/e2e/CancelInvocationTest.kt
@@ -32,7 +32,7 @@ import org.awaitility.kotlin.matches
 import org.awaitility.kotlin.untilCallTo
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.params.provider.EnumSource
 
 class JavaCancelInvocationTest : BaseCancelInvocationTest() {
   companion object {
@@ -70,7 +70,8 @@ class NodeCancelInvocationTest : BaseCancelInvocationTest() {
 
 abstract class BaseCancelInvocationTest {
   @ParameterizedTest(name = "cancel blocked invocation on {0}")
-  @MethodSource("blockingOperations")
+  @EnumSource(
+      value = BlockingOperation::class, names = ["UNRECOGNIZED"], mode = EnumSource.Mode.EXCLUDE)
   fun cancelInvocation(
       blockingOperation: BlockingOperation,
       @InjectBlockingStub ingressClient: IngressBlockingStub,
@@ -106,8 +107,7 @@ abstract class BaseCancelInvocationTest {
     val cancelTestClient = CancelTestServiceGrpcKt.CancelTestServiceCoroutineStub(channel)
 
     // The termination signal might arrive before the blocking call to the cancel singleton was
-    // made,
-    // so we need to retry.
+    // made, so we need to retry.
     await.ignoreException(TimeoutCancellationException::class.java).until {
       client.terminateInvocation(id, TerminationMode.CANCEL)
       runBlocking {
@@ -120,10 +120,4 @@ abstract class BaseCancelInvocationTest {
     // Check that the singleton service is unlocked
     blockingServiceClient.isUnlocked(Empty.getDefaultInstance())
   }
-
-  companion object {
-    @JvmStatic
-    fun blockingOperations() =
-        listOf(BlockingOperation.AWAKEABLE, BlockingOperation.CALL, BlockingOperation.SLEEP)
-  }
 }