modfied test-client