Add test client support