cleaned up the client tests