Fix indentation to make the code more codelike ;-)
Convert one test to new style of client/server generation, nuke now defunct protobuffer declaration used for testing.