Added gateway test client