Cleanup client/server proto, add more tests