Use a more meaningful name for variables, fix style
Add tests for non-protocol methods in client
Start adding tests for http-client-internals
Fix failing test