Cleanup (cont., 2)
Initial commit of test/client; updates to test/common and test/service