Set up test cases from old client to run with the new client
Not all tests are currently passing