Merge "Migrate thirdparty tests to resource_* fixtures"