GPII-76: Committing unfinished changes related to overall grade cleanup and test rewrite.