Integrate client and server test suite #125