Refactored test client to do things synchronously by default.