Merge "When merging tests, prefer non-blocklisted ones."