Moving more stuff from *ApiCaller tests to the integration tests