diff --git a/NightLight.Core.Tests/InteractionListGenerators.fs b/NightLight.Core.Tests/InteractionListGenerators.fs
index e8cbdf8..42d0f5f 100644
--- a/NightLight.Core.Tests/InteractionListGenerators.fs
+++ b/NightLight.Core.Tests/InteractionListGenerators.fs
@@ -37,14 +37,12 @@ let private genHumanInteraction =
 
 let private genRemoteInteraction =
     Gen.oneof
-        [ Gen.elements [ RemotePressedOnButton; RemotePressedOffButton ]
+        [ ArbMap.defaults
+          |> ArbMap.generate<BedroomControllingRemoteInteraction>
           |> Gen.map BedroomControllingRemoteInteraction
 
-          Gen.elements
-              [ RemotePressedLeftButton
-                RemotePressedRightButton
-                LivingRoomRemotePressedOnButton
-                LivingRoomRemotePressedOffButton ]
+          ArbMap.defaults
+          |> ArbMap.generate<LivingRoomControllingRemoteAction>
           |> Gen.map LivingRoomControllingRemoteInteraction ]
 
 let private genInteraction =