Merge "Blacklist failing tests, and rename one."