minor changes to client and testing of client