Issue #504 fixing specs in grade model