Add support to test client with server