Refactor grader tests