Merge "Migrate image API tests to resource_* fixtures"