diff --git a/hbs2-core/test/HasProtocol.hs b/hbs2-core/test/HasProtocol.hs
index 90dd5e8a..232fe9dd 100644
--- a/hbs2-core/test/HasProtocol.hs
+++ b/hbs2-core/test/HasProtocol.hs
@@ -6,10 +6,12 @@ import Data.Kind
 import Data.Proxy
 import GHC.TypeLits
 
-class HasProtocol p a  | a -> p where
+class HasPeer p where
+  type family (Peer p) :: Type
+
+class HasPeer p => HasProtocol p a  | a -> p where
   type family ProtocolId a = (id :: Nat) | id -> a
   type family Encoded p :: Type
-  type family (Peer p) :: Type
 
   protoId :: forall . KnownNat (ProtocolId a) => Proxy a -> Integer
   protoId _ = natVal (Proxy @(ProtocolId a))
diff --git a/hbs2-core/test/TestUniqProtoId.hs b/hbs2-core/test/TestUniqProtoId.hs
index c75e4289..8991de0c 100644
--- a/hbs2-core/test/TestUniqProtoId.hs
+++ b/hbs2-core/test/TestUniqProtoId.hs
@@ -31,10 +31,12 @@ type family Encoding a :: Type
 
 data Fake
 
+instance HasPeer Fake where
+  type instance Peer Fake = Int
+
 instance HasProtocol Fake PingPong where
   type instance ProtocolId PingPong = 1
   type instance Encoded Fake = String
-  type instance Peer Fake = Int
   decode = undefined
   encode = undefined
 
@@ -54,9 +56,9 @@ makeResponse h = AnyProtocol { getProtoId  = natVal (Proxy @(ProtocolId p))
                              , handle = h
                              }
 
-data EngineEnv =
+data EngineEnv = forall p . HasPeer p =>
   EngineEnv
-  {
+  { peer :: Maybe (Peer p)
   }
 
 newtype EngineM m a = EngineM { fromEngine :: ReaderT EngineEnv m a }
@@ -72,18 +74,18 @@ instance (Monad m, HasProtocol e p) => Response e p (EngineM m) where
     -- TODO: sendTo
     undefined
 
+pingPongHandler :: forall a  m . (MonadIO m, Response a PingPong  m) => PingPong -> m ()
+pingPongHandler =
+  \case
+    Ping c -> liftIO (print "effect: PING") >> response @a @PingPong (Pong c)
+    Pong _ -> liftIO (print "effect: PONG")
+
 testUniqiProtoId :: IO ()
 testUniqiProtoId = do
 
-  let env = EngineEnv
+  let env = EngineEnv @Fake Nothing
 
-  -- let ssid = 0
-  -- runEngineM env $ request 2 (Ping ssid)
-
-  let pingpong = makeResponse
-        \case
-          Ping c -> lift (print "effect: PING") >> response (Pong c)
-          Pong _ -> lift (print "effect: PONG")
+  let pingpong = makeResponse pingPongHandler
 
   let decoders = mempty :: Map Integer (AnyProtocol String (EngineM IO))
   let dec = Map.insert 1 pingpong decoders