Ongoing migration of tests to the new infrastructure. The old tests stay in place until we have another way to test the client API.