Merge "Migrate scenario tests to resource_* fixtures"