Rpc Handler tests
reformatting messages in tests