Fix unit test, check message flow into protocol