GPII-76: More updates to the grade. More fine-grained grade tests.