Updated tests to make fewer calls to API to conserve requests