Add test client and debug