Fix tests
Transition to MsgSerializable
All unit tests pass again