Added some unit tests for the client -> server