Fix setup/teardown calls in client and add specs