Added more tests for the client
Programmers: Tobias