diff --git a/tests/HOTASDeviceTests.cs b/tests/HOTASDeviceTests.cs
index 4ce38b1..47f27a2 100644
--- a/tests/HOTASDeviceTests.cs
+++ b/tests/HOTASDeviceTests.cs
@@ -262,7 +262,7 @@ public void set_mode_profile()
             device.SetMode(newProfile);
 
             Assert.Equal(2, device.Modes.Count);
-            Assert.Single(device.Modes[1]);
+            Assert.Equal(3, device.Modes[1].Count);
             Assert.Equal(2, device.Modes[2].Count);
             Assert.Equal("test map 2,2", device.Modes[2][1].MapName);
 
@@ -333,7 +333,7 @@ public void copy_mode_profile_from_template()
             Assert.Equal("test map 2,1", device.Modes[2][0].MapName);
             device.CopyModeFromTemplate(1, 2);
 
-            Assert.Equal(2, device.Modes[2].Count);
+            Assert.Equal(3, device.Modes[2].Count);
             Assert.Equal("test map 1,1", device.Modes[2][0].MapName);
             Assert.Equal("test map 1,2", device.Modes[2][1].MapName);
         }
@@ -354,7 +354,7 @@ public void copy_mode_profile_from_template_no_destination_map()
 
             device.CopyModeFromTemplate(1, 2);
 
-            Assert.Equal(2, device.Modes[2].Count);
+            Assert.Equal(3, device.Modes[2].Count);
             Assert.Equal("test map 1,1", device.Modes[2][0].MapName);
             Assert.Equal("test map 1,2", device.Modes[2][1].MapName);
         }
@@ -542,8 +542,8 @@ public void set_mode()
 
             device.SetMode(1);
 
-            Assert.Single(device.ButtonMap);
-            Assert.Equal("test map 1,1", device.ButtonMap[0].MapName);
+            Assert.Equal(3, device.ButtonMap.Count);
+            Assert.Equal("test map 1,1", device.ButtonMap[2].MapName);
 
             device.SetMode(2);
 
@@ -600,8 +600,8 @@ public void reset()
             device.SetMode(1);
 
             //baseline - verify we actually still have different values. set_mode test should also fail if this fails
-            Assert.Single(device.ButtonMap);
-            Assert.Equal(48, device.ButtonMap[0].MapId);
+            Assert.Equal(3, device.ButtonMap.Count);
+            Assert.Equal(48, device.ButtonMap[2].MapId);
 
             device.Reset();