Merge "Revert "Revert "Fix a checker test"""