Minor changes in test
Rename some methods in the client
Added more tests to the client