diff --git a/mod/workshop/form/accumulative/lib.php b/mod/workshop/form/accumulative/lib.php
index ffe072fa4ee..5426143924f 100644
--- a/mod/workshop/form/accumulative/lib.php
+++ b/mod/workshop/form/accumulative/lib.php
@@ -273,9 +273,9 @@ class workshop_accumulative_strategy implements workshop_strategy {
     public function get_assessments_recordset($restrict) {
         global $DB;
 
-        $sql = 'SELECT a.id AS assessmentid,a.weight AS assessmentweight,a.reviewerid,
+        $sql = 'SELECT a.id AS assessmentid, a.weight AS assessmentweight, a.reviewerid, a.gradinggrade,
                        s.id AS submissionid,
-                       g.dimensionid,g.grade,
+                       g.dimensionid, g.grade,
                        d.weight AS dimensionweight
                   FROM {workshop_submissions} s
                   JOIN {workshop_assessments} a ON (a.submissionid = s.id)
diff --git a/mod/workshop/form/accumulative/simpletest/teststrategy.php b/mod/workshop/form/accumulative/simpletest/testlib.php
similarity index 100%
rename from mod/workshop/form/accumulative/simpletest/teststrategy.php
rename to mod/workshop/form/accumulative/simpletest/testlib.php
diff --git a/mod/workshop/form/numerrors/simpletest/teststrategy.php b/mod/workshop/form/numerrors/simpletest/testlib.php
similarity index 100%
rename from mod/workshop/form/numerrors/simpletest/teststrategy.php
rename to mod/workshop/form/numerrors/simpletest/testlib.php