updated grading logic to account for checking after a classconflict form time, and added an associated test