Added a whole bunch of tests for client