added new client code, removed test