diff --git a/lib/logitech_receiver/hidpp20.py b/lib/logitech_receiver/hidpp20.py
index 15c1c475..998cd884 100644
--- a/lib/logitech_receiver/hidpp20.py
+++ b/lib/logitech_receiver/hidpp20.py
@@ -147,7 +147,7 @@ class FeaturesArray(dict):
             self.inverse[index] = feature
 
     def __delitem__(self, feature):
-        raise ValueError("Don't delete features from FeatureArray")
+        raise Exception("Don't delete features from FeatureArray")
 
     def __len__(self) -> int:
         return self.count
diff --git a/tests/logitech_receiver/test_hidpp20_complex.py b/tests/logitech_receiver/test_hidpp20_complex.py
index c60432c0..1213bb6e 100644
--- a/tests/logitech_receiver/test_hidpp20_complex.py
+++ b/tests/logitech_receiver/test_hidpp20_complex.py
@@ -5,7 +5,6 @@ from typing import Optional
 
 import pytest
 
-from lib.logitech_receiver import common
 from lib.logitech_receiver import hidpp20
 from lib.logitech_receiver import hidpp20_constants
 from lib.logitech_receiver import special_keys
@@ -26,7 +25,7 @@ class Device:
     protocol: float = 2.0
     responses: Any = field(default_factory=list)
 
-    def request(self, id, *params, no_reply=False):
+    def request(self, id, params=None, no_reply=False):
         if params is None:
             params = []
         print("REQUEST ", self.name, hex(id), params)
@@ -43,19 +42,20 @@ class Device:
 device_offline = Device("REGISTERS", False)
 device_registers = Device("OFFLINE", True, 1.0)
 device_nofeatures = Device("NOFEATURES", True, 4.5)
-device_zerofeatures = Device("ZEROFEATURES", True, 4.5, [Response("0000", 0x0000, (b"\x00\x01",))])
-device_broken = Device("BROKEN", True, 4.5, [Response("0500", 0x0000, (b"\x00\x01",)), Response(None, 0x0100, ())])
+device_zerofeatures = Device("ZEROFEATURES", True, 4.5, [Response("0000", 0x0000, b"\x00\x01")])
+device_broken = Device("BROKEN", True, 4.5, [Response("0000", 0x0000, b"\x00\x01"), Response(None, 0x0100, [])])
+
 responses_standard = [
-    Response("0100", 0x0000, (b"\x00\x01",)),
-    Response("05000300", 0x0000, (b"\x1b\x04",)),
-    Response("0500", 0x0100, ()),
-    Response("01000000", 0x0110, (0x02,)),
-    Response("1B040003", 0x0110, (0x05,)),
-    Response("00110012AB010203CD00", 0x0510, (0,)),
-    Response("01110022AB010203CD00", 0x0510, (1,)),
-    Response("03110032AB010204CD00", 0x0510, (3,)),
-    Response("00010111AB010203CD00", 0x0510, (2,)),
-    Response("00030333AB010203CD00", 0x0510, (4,)),
+    Response("0100", 0x0000, b"\x00\x01"),
+    Response("05000300", 0x0000, b"\x1b\x04"),
+    Response("0500", 0x0100, []),
+    Response("01000000", 0x0110, 0x02),
+    Response("1B040003", 0x0110, 0x05),
+    Response("00110012AB010203CD00", 0x0510, 0),
+    Response("01110022AB010203CD00", 0x0510, 1),
+    Response("03110032AB010204CD00", 0x0510, 3),
+    Response("00010111AB010203CD00", 0x0510, 2),
+    Response("00030333AB010203CD00", 0x0510, 4),
 ]
 device_standard = Device("STANDARD", True, 4.5, responses_standard)
 
@@ -110,49 +110,6 @@ def test_FeaturesArray_get_feature(device, expected0, expected1, expected2, expe
     assert result5v == expected5v
 
 
-@pytest.mark.parametrize(
-    "device, expected_result",
-    [
-        (device_zerofeatures, []),
-        (
-            device_standard,
-            [
-                (hidpp20_constants.FEATURE.ROOT, 0),
-                (hidpp20_constants.FEATURE.FEATURE_SET, 1),
-                (common.NamedInt(256, "unknown:0100"), 2),
-                (None, 3),
-                (None, 4),
-                (hidpp20_constants.FEATURE.REPROG_CONTROLS_V4, 5),
-            ],
-        ),
-    ],
-)
-def test_FeaturesArray_enumerate(device, expected_result):
-    featuresarray = hidpp20.FeaturesArray(device)
-
-    result = list(featuresarray.enumerate())
-
-    assert result == expected_result
-
-
-def test_FeaturesArray_setitem():
-    featuresarray = hidpp20.FeaturesArray(device_standard)
-
-    featuresarray[hidpp20_constants.FEATURE.ROOT] = 3
-    featuresarray[hidpp20_constants.FEATURE.FEATURE_SET] = 5
-    featuresarray[hidpp20_constants.FEATURE.FEATURE_SET] = 4
-
-    assert featuresarray[hidpp20_constants.FEATURE.FEATURE_SET] == 4
-    assert featuresarray.inverse[4] == hidpp20_constants.FEATURE.FEATURE_SET
-
-
-def test_FeaturesArray_delitem():
-    featuresarray = hidpp20.FeaturesArray(device_standard)
-
-    with pytest.raises(ValueError):
-        del featuresarray[5]
-
-
 @pytest.mark.parametrize(
     "device, expected0, expected1, expected2, expected1v",
     [(device_zerofeatures, None, None, None, None), (device_standard, 0, 5, None, 3)],
@@ -172,53 +129,6 @@ def test_FeaturesArray_getitem(device, expected0, expected1, expected2, expected
     assert result_1v == expected1v
 
 
-@pytest.mark.parametrize(
-    "device, index, cid, tid, flags, default_task, flag_names",
-    [
-        (device_standard, 2, 1, 1, 0x30, "Volume Up", ["reprogrammable", "divertable"]),
-        (device_standard, 1, 2, 2, 0x20, "Volume Down", ["divertable"]),
-    ],
-)
-def test_ReprogrammableKey_key(device, index, cid, tid, flags, default_task, flag_names):
-    key = hidpp20.ReprogrammableKey(device, index, cid, tid, flags)
-
-    assert key._device == device
-    assert key.index == index
-    assert key._cid == cid
-    assert key._tid == tid
-    assert key._flags == flags
-    assert key.key == special_keys.CONTROL[cid]
-    assert key.default_task == common.NamedInt(cid, default_task)
-    assert list(key.flags) == flag_names
-
-
-@pytest.mark.parametrize(
-    "device, index, cid, tid, flags, pos, group, gmask, default_task, flag_names, group_names",
-    [
-        (device_standard, 2, 1, 1, 0x30, 0, 1, 3, "Volume Up", ["reprogrammable", "divertable"], ["g1", "g2"]),
-        (device_standard, 1, 2, 2, 0x20, 1, 2, 1, "Volume Down", ["divertable"], ["g1"]),
-    ],
-)
-def test_ReprogrammableKeyV4_key(device, index, cid, tid, flags, pos, group, gmask, default_task, flag_names, group_names):
-    key = hidpp20.ReprogrammableKeyV4(device, index, cid, tid, flags, pos, group, gmask)
-
-    assert key._device == device
-    assert key.index == index
-    assert key._cid == cid
-    assert key._tid == tid
-    assert key._flags == flags
-    assert key.pos == pos
-    assert key.group == group
-    assert key._gmask == gmask
-    assert key.key == special_keys.CONTROL[cid]
-    assert key.default_task == common.NamedInt(cid, default_task)
-    assert list(key.flags) == flag_names
-    assert list(key.group_mask) == group_names
-
-
-# mapped_to requires ensuring that all keys are set up, so this is done below
-
-
 @pytest.mark.parametrize(
     "device, index", [(device_zerofeatures, -1), (device_zerofeatures, 5), (device_standard, -1), (device_standard, 6)]
 )
@@ -270,122 +180,3 @@ def test_KeysArrayV4_index(key, index):
     result = keysarray.index(key)
 
     assert result == index
-
-
-responses_key = [
-    Response("0A00", 0x0100, ()),
-    Response("01000000", 0x0000, (b"\x00\x01",)),
-    Response("09000300", 0x0000, (b"\x1b\x04",)),
-    Response("00500038010001010400000000000000", 0x0910, (0,)),
-    Response("00510039010001010400000000000000", 0x0910, (1,)),
-    Response("0052003A310003070500000000000000", 0x0910, (2,)),
-    Response("0053003C310002030500000000000000", 0x0910, (3,)),
-    Response("0056003E310002030500000000000000", 0x0910, (4,)),
-    Response("00C300A9310003070500000000000000", 0x0910, (5,)),
-    Response("00C4009D310003070500000000000000", 0x0910, (6,)),
-    Response("00D700B4A00004000300000000000000", 0x0910, (7,)),
-    Response(
-        "00500000000000000000000000000000",
-        0x0920,
-        (
-            0,
-            0x50,
-        ),
-    ),
-    Response(
-        "00510000000000000000000000000000",
-        0x0920,
-        (
-            0,
-            0x51,
-        ),
-    ),
-    Response(
-        "00520000500000000000000000000000",
-        0x0920,
-        (
-            0,
-            0x52,
-        ),
-    ),
-    Response(
-        "00530000000000000000000000000000",
-        0x0920,
-        (
-            0,
-            0x53,
-        ),
-    ),
-    Response(
-        "00560000000000000000000000000000",
-        0x0920,
-        (
-            0,
-            0x56,
-        ),
-    ),
-    Response(
-        "00C30000000000000000000000000000",
-        0x0920,
-        (
-            0,
-            0xC3,
-        ),
-    ),
-    Response(
-        "00C40000500000000000000000000000",
-        0x0920,
-        (
-            0,
-            0xC4,
-        ),
-    ),
-    Response(
-        "00D70000510000000000000000000000",
-        0x0920,
-        (
-            0,
-            0xD7,
-        ),
-    ),
-]
-device_key = Device("KEY", True, 4.5, responses=responses_key)
-
-
-@pytest.mark.parametrize(
-    "key, expected_index, expected_mapped_to, expected_remappable_to",
-    [
-        (
-            special_keys.CONTROL.Left_Button,
-            0,
-            common.NamedInt(0x50, "Left Click"),
-            [common.NamedInt(0x50, "Left Click"), common.NamedInt(0x51, "Right Click")],
-        ),
-        (
-            special_keys.CONTROL.Right_Button,
-            1,
-            common.NamedInt(0x51, "Right Click"),
-            [common.NamedInt(0x51, "Right Click"), common.NamedInt(0x50, "Left Click")],
-        ),
-        (special_keys.CONTROL.Middle_Button, 2, common.NamedInt(0x50, "Left Click"), None),
-        (special_keys.CONTROL.Back_Button, 3, common.NamedInt(0x53, "Mouse Back Button"), None),
-        (special_keys.CONTROL.Forward_Button, 4, common.NamedInt(0x56, "Mouse Forward Button"), None),
-        (special_keys.CONTROL.Mouse_Gesture_Button, 5, common.NamedInt(0xC3, "Gesture Button Navigation"), None),
-        (special_keys.CONTROL.Smart_Shift, 6, common.NamedInt(0x50, "Left Click"), None),
-        (special_keys.CONTROL.Virtual_Gesture_Button, 7, common.NamedInt(0x51, "Right Click"), None),
-    ],
-)
-def test_KeysArrayV4_key(key, expected_index, expected_mapped_to, expected_remappable_to):
-    device_key.features = hidpp20.FeaturesArray(device_key)
-    device_key.features[hidpp20_constants.FEATURE.REPROG_CONTROLS_V4]
-    device_key.keys = hidpp20.KeysArrayV4(device_key, 8)
-    device_key.keys._ensure_all_keys_queried()
-
-    index = device_key.keys.index(key)
-    mapped_to = device_key.keys[expected_index].mapped_to
-    remappable_to = device_key.keys[expected_index].remappable_to
-
-    assert index == expected_index
-    assert mapped_to == expected_mapped_to
-    if expected_remappable_to is not None:
-        assert list(remappable_to) == expected_remappable_to
diff --git a/tests/logitech_receiver/test_hidpp20_simple.py b/tests/logitech_receiver/test_hidpp20_simple.py
index 40919397..4e0bd5f5 100644
--- a/tests/logitech_receiver/test_hidpp20_simple.py
+++ b/tests/logitech_receiver/test_hidpp20_simple.py
@@ -11,18 +11,6 @@ from lib.logitech_receiver import hidpp20
 from lib.logitech_receiver import hidpp20_constants
 
 
-@dataclass
-class Dumper:
-    def represent_int(arg):
-        return arg
-
-
-def test_hexint_presenter():
-    result = hidpp20.hexint_presenter(Dumper, 18)
-
-    assert result == "0x12"
-
-
 @dataclass
 class Device:
     name: str = "TEST DEVICE"