Merge "Fix a checker test"