Added more grader checks.