Update CMS grading tests