cleaned up client test code