Clean up test client implementation. Next steps will improve
documetnation and completeness of test clients.