187cc673c9
This commit also improves the existing tests and add a new scenario to verify the 'Do not mark for regrade' behavior.