diff --git a/packages/keybindings-view/src/parts/InitializeTextMeasurementWorker/InitializeTextMeasurementWorker.ts b/packages/keybindings-view/src/parts/InitializeTextMeasurementWorker/InitializeTextMeasurementWorker.ts
index 55e01c3c..3bcf6e60 100644
--- a/packages/keybindings-view/src/parts/InitializeTextMeasurementWorker/InitializeTextMeasurementWorker.ts
+++ b/packages/keybindings-view/src/parts/InitializeTextMeasurementWorker/InitializeTextMeasurementWorker.ts
@@ -2,7 +2,6 @@ import { LazyTransferMessagePortRpcParent } from '@lvce-editor/rpc'
 import { RendererWorker, TextMeasurementWorker } from '@lvce-editor/rpc-registry'
 
 const send = (port: MessagePort): Promise<void> => {
-  // @ts-ignore
   return RendererWorker.sendMessagePortToTextMeasurementWorker(port)
 }
 
diff --git a/packages/keybindings-view/src/parts/KeyBindingsInitial/KeyBindingsInitial.ts b/packages/keybindings-view/src/parts/KeyBindingsInitial/KeyBindingsInitial.ts
index 38be2115..07748769 100644
--- a/packages/keybindings-view/src/parts/KeyBindingsInitial/KeyBindingsInitial.ts
+++ b/packages/keybindings-view/src/parts/KeyBindingsInitial/KeyBindingsInitial.ts
@@ -1,6 +1,5 @@
 import { RendererWorker } from '@lvce-editor/rpc-registry'
 
 export const getKeyBindings = (): Promise<readonly any[]> => {
-  // @ts-ignore
   return RendererWorker.invoke('KeyBindingsInitial.getKeyBindings')
 }
diff --git a/packages/keybindings-view/test/KeyBindingsInitial.test.ts b/packages/keybindings-view/test/KeyBindingsInitial.test.ts
index bb2bfd27..2b9049c9 100644
--- a/packages/keybindings-view/test/KeyBindingsInitial.test.ts
+++ b/packages/keybindings-view/test/KeyBindingsInitial.test.ts
@@ -21,10 +21,11 @@ test('getKeyBindings', async () => {
 })
 
 test('getKeyBindings - error handling', async () => {
-  RendererWorker.registerMockRpc({
+  using mockRpc = RendererWorker.registerMockRpc({
     'KeyBindingsInitial.getKeyBindings'() {
       return Promise.reject(new Error('Failed to get key bindings'))
     },
   })
   await expect(KeyBindingsInitial.getKeyBindings()).rejects.toThrow('Failed to get key bindings')
+  expect(mockRpc.invocations).toEqual([['KeyBindingsInitial.getKeyBindings']])
 })
diff --git a/packages/keybindings-view/test/MergeClassNames.test.ts b/packages/keybindings-view/test/MergeClassNames.test.ts
deleted file mode 100644
index 752a83cb..00000000
--- a/packages/keybindings-view/test/MergeClassNames.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { expect, test } from '@jest/globals'
-import * as MergeClassNames from '../src/parts/MergeClassNames/MergeClassNames.ts'
-
-test('mergeClassNames - single class', () => {
-  expect(MergeClassNames.mergeClassNames('class1')).toBe('class1')
-})
-
-test('mergeClassNames - multiple classes', () => {
-  expect(MergeClassNames.mergeClassNames('class1', 'class2', 'class3')).toBe('class1 class2 class3')
-})
-
-test('mergeClassNames - with empty strings', () => {
-  expect(MergeClassNames.mergeClassNames('class1', '', 'class2')).toBe('class1 class2')
-})
-
-test('mergeClassNames - with falsy values', () => {
-  // @ts-ignore
-  expect(MergeClassNames.mergeClassNames('class1', undefined, null, false, 'class2')).toBe('class1 class2')
-})
-
-test('mergeClassNames - all falsy values', () => {
-  // @ts-ignore
-  expect(MergeClassNames.mergeClassNames('', undefined, null, false)).toBe('')
-})