tidy up client test module