MDL-47420 Grades: Get unit tests passing on natural grading branch

Part of: MDL-46576