cleaned up client tests