Wrapped all the tests in a try/catch block, and clean up properly as-needed. Also simplified things on the client and server by changing, for example, 'id' to 'workspace_id'.
A couple tiny fixes to keep working with the changes to Vault