diff --git a/tests/device/device_shadow/binding_test.py b/tests/device/device_shadow/binding_test.py
index 1b79d582..7f7aa2a9 100644
--- a/tests/device/device_shadow/binding_test.py
+++ b/tests/device/device_shadow/binding_test.py
@@ -11,6 +11,7 @@
 """
 
 import pytest
+from common.plug_indexes import WindowIndex
 from control_surfaces import (
     ControlEvent,
     PlayButton,
@@ -40,7 +41,7 @@ def _dummy(*args, **kwargs) -> bool:
             0.0,
             0,
             False,
-        ), None)
+        ), WindowIndex.MIXER)
 
 
 def test_bind_same():
@@ -82,4 +83,4 @@ def _dummy(*args, **kwargs) -> bool:
                 0.0,
                 0,
                 False,
-            ), None)
+            ), WindowIndex.MIXER)
diff --git a/tests/device/device_shadow/process_test.py b/tests/device/device_shadow/process_test.py
index af20a43d..8b803da1 100644
--- a/tests/device/device_shadow/process_test.py
+++ b/tests/device/device_shadow/process_test.py
@@ -12,6 +12,7 @@
 
 # import pytest
 # from common.types import FlMidiMsg
+from common.plug_indexes import WindowIndex
 from control_surfaces import (
     ControlEvent,
     PlayButton,
@@ -34,4 +35,4 @@ def test_process_unbound():
         0.0,
         0,
         False,
-    ), None)
+    ), WindowIndex.MIXER)
diff --git a/tests/filter_test.py b/tests/filter_test.py
index a8bf7569..d7da9bba 100644
--- a/tests/filter_test.py
+++ b/tests/filter_test.py
@@ -60,11 +60,3 @@ def test_filter_to_window():
     assert was_filtered(func, (1, ))
     assert was_filtered(func, (1, 2))
     assert not was_filtered(func, 0)
-
-
-def test_filter_out_none():
-    func = get_function(event_filters.toSafeIndex)
-    assert was_filtered(func, None)
-    assert not was_filtered(func, 0)
-    assert not was_filtered(func, (1, ))
-    assert not was_filtered(func, (1, 2))