Client unit tests

Update client unit tests so that they pass