Add support for a test client