diff --git a/src/transformer/events/mod_quiz/question_answered/essay.php b/src/transformer/events/mod_quiz/question_answered/essay.php
index 267d23b86fe8554ca5952611b8cb610200e72cd6..62bb5f4f7c97816787cc7eee1bce0063c971bc41 100644
--- a/src/transformer/events/mod_quiz/question_answered/essay.php
+++ b/src/transformer/events/mod_quiz/question_answered/essay.php
@@ -38,11 +38,11 @@ function essay(array $config, \stdClass $event, \stdClass $questionattempt, \std
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
-                    $lang => $questionattempt->questionsummary,
+                    $lang => $question->questiontext,
                 ],
                 'interactionType' => 'long-fill-in',
             ]
diff --git a/src/transformer/events/mod_quiz/question_answered/gapselect.php b/src/transformer/events/mod_quiz/question_answered/gapselect.php
index f3beea93e693bcf225be209ce6630def6fbdeca1..083fed3a1d47f094b23ae638d5c809da4c9b9d2d 100644
--- a/src/transformer/events/mod_quiz/question_answered/gapselect.php
+++ b/src/transformer/events/mod_quiz/question_answered/gapselect.php
@@ -25,10 +25,10 @@ function gapselect(array $config, \stdClass $event, \stdClass $questionattempt,
     $user = $repo->read_record_by_id('user', $event->relateduserid);
     $course = $repo->read_record_by_id('course', $event->courseid);
     $attempt = $repo->read_record_by_id('quiz_attempts', $questionattempt->questionusageid);
-    $question = $repo->read_record_by_id('question', $questionattempt->questionid);
     $quiz = $repo->read_record_by_id('quiz', $attempt->quiz);
     $coursemodule = $repo->read_record_by_id('course_modules', $event->contextinstanceid);
     $lang = utils\get_course_lang($course);
+    $selections = explode('} {', rtrim(ltrim($questionattempt->responsesummary, '{'), '}'));
 
     return [[
         'actor' => utils\get_user($config, $user),
@@ -39,9 +39,9 @@ function gapselect(array $config, \stdClass $event, \stdClass $questionattempt,
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
                     $lang => $question->questiontext,
                 ],
@@ -53,6 +53,9 @@ function gapselect(array $config, \stdClass $event, \stdClass $questionattempt,
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== null,
             'success' => $questionattempt->rightanswer === $questionattempt->responsesummary,
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/sequencing/response' => $selections,
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/events/mod_quiz/question_answered/match.php b/src/transformer/events/mod_quiz/question_answered/match.php
index cc3356717579437501410d1d3f3de49e5edc062d..dfcc7d97f2cac1a10dbc22d672f3580f332cc5e5 100644
--- a/src/transformer/events/mod_quiz/question_answered/match.php
+++ b/src/transformer/events/mod_quiz/question_answered/match.php
@@ -25,10 +25,20 @@ function match(array $config, \stdClass $event, \stdClass $questionattempt, \std
     $user = $repo->read_record_by_id('user', $event->relateduserid);
     $course = $repo->read_record_by_id('course', $event->courseid);
     $attempt = $repo->read_record_by_id('quiz_attempts', $questionattempt->questionusageid);
-    $question = $repo->read_record_by_id('question', $questionattempt->questionid);
     $quiz = $repo->read_record_by_id('quiz', $attempt->quiz);
     $coursemodule = $repo->read_record_by_id('course_modules', $event->contextinstanceid);
     $lang = utils\get_course_lang($course);
+    $selections = array_reduce(
+        explode('; ', $questionattempt->responsesummary),
+        function ($reduction, $selection) {
+            $split = explode("\n -> ", $selection);
+            $selectionkey = $split[0];
+            $selectionvalue = $split[1];
+            $reduction[$selectionkey] = $selectionvalue;
+            return $reduction;
+        },
+        []
+    );
 
     return [[
         'actor' => utils\get_user($config, $user),
@@ -39,9 +49,9 @@ function match(array $config, \stdClass $event, \stdClass $questionattempt, \std
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
                     $lang => $question->questiontext,
                 ],
@@ -53,6 +63,9 @@ function match(array $config, \stdClass $event, \stdClass $questionattempt, \std
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== null,
             'success' => $questionattempt->rightanswer === $questionattempt->responsesummary,
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/matching/response' => $selections,
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/events/mod_quiz/question_answered/multichoice.php b/src/transformer/events/mod_quiz/question_answered/multichoice.php
index 7079107dd3e19a6f441a362e24bb210940bee44a..793170b2a8b669e77bca2fc2c1f629757a9ab977 100644
--- a/src/transformer/events/mod_quiz/question_answered/multichoice.php
+++ b/src/transformer/events/mod_quiz/question_answered/multichoice.php
@@ -38,11 +38,11 @@ function multichoice(array $config, \stdClass $event, \stdClass $questionattempt
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
-                    $lang => $questionattempt->questionsummary,
+                    $lang => $question->questiontext,
                 ],
                 'interactionType' => 'choice',
             ]
@@ -51,6 +51,9 @@ function multichoice(array $config, \stdClass $event, \stdClass $questionattempt
         'result' => [
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== '',
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/choice/response' => $questionattempt->responsesummary,
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/events/mod_quiz/question_answered/numerical.php b/src/transformer/events/mod_quiz/question_answered/numerical.php
index 768408dad551fae758077cc21169199b8feb9bee..4f86bc707e30ad1eb1c04f897d103127b700a521 100644
--- a/src/transformer/events/mod_quiz/question_answered/numerical.php
+++ b/src/transformer/events/mod_quiz/question_answered/numerical.php
@@ -38,11 +38,11 @@ function numerical(array $config, \stdClass $event, \stdClass $questionattempt,
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
-                    $lang => $questionattempt->questionsummary,
+                    $lang => $question->questiontext,
                 ],
                 'interactionType' => 'numeric',
             ]
@@ -52,6 +52,9 @@ function numerical(array $config, \stdClass $event, \stdClass $questionattempt,
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== '',
             'success' => $questionattempt->rightanswer === $questionattempt->responsesummary,
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/numeric/response' => floatval($questionattempt->responsesummary),
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/events/mod_quiz/question_answered/randomsamatch.php b/src/transformer/events/mod_quiz/question_answered/randomsamatch.php
index 0bba1558407af5ae3675293f19edb5c6ec5b7ff6..0d427a7b551cedfe2a9c0f38d4860ba890e9264e 100644
--- a/src/transformer/events/mod_quiz/question_answered/randomsamatch.php
+++ b/src/transformer/events/mod_quiz/question_answered/randomsamatch.php
@@ -28,6 +28,17 @@ function randomsamatch(array $config, \stdClass $event, \stdClass $questionattem
     $quiz = $repo->read_record_by_id('quiz', $attempt->quiz);
     $coursemodule = $repo->read_record_by_id('course_modules', $event->contextinstanceid);
     $lang = utils\get_course_lang($course);
+    $selections = array_reduce(
+        explode('; ', $questionattempt->responsesummary),
+        function ($reduction, $selection) {
+            $split = explode("\n -> ", $selection);
+            $selectionkey = $split[0];
+            $selectionvalue = $split[1];
+            $reduction[$selectionkey] = $selectionvalue;
+            return $reduction;
+        },
+        []
+    );
 
     return [[
         'actor' => utils\get_user($config, $user),
@@ -38,9 +49,9 @@ function randomsamatch(array $config, \stdClass $event, \stdClass $questionattem
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
                     $lang => $question->questiontext,
                 ],
@@ -52,6 +63,9 @@ function randomsamatch(array $config, \stdClass $event, \stdClass $questionattem
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== '',
             'success' => $questionattempt->rightanswer === $questionattempt->responsesummary,
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/matching/response' => $selections,
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/events/mod_quiz/question_answered/shortanswer.php b/src/transformer/events/mod_quiz/question_answered/shortanswer.php
index 0ccbdddb8c1c1ed53edf29fc62d685848bc547db..fab3245f08a0392b31eb456e8da68f512a6d5665 100644
--- a/src/transformer/events/mod_quiz/question_answered/shortanswer.php
+++ b/src/transformer/events/mod_quiz/question_answered/shortanswer.php
@@ -38,11 +38,11 @@ function shortanswer(array $config, \stdClass $event, \stdClass $questionattempt
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
-                    $lang => $questionattempt->questionsummary,
+                    $lang => $question->questiontext,
                 ],
                 'interactionType' => 'fill-in',
             ]
diff --git a/src/transformer/events/mod_quiz/question_answered/truefalse.php b/src/transformer/events/mod_quiz/question_answered/truefalse.php
index 535b7e3a6223666b8dcf63a2a52b727cc637c417..affc24d622a45aa82d2831ca6313da59e4796db4 100644
--- a/src/transformer/events/mod_quiz/question_answered/truefalse.php
+++ b/src/transformer/events/mod_quiz/question_answered/truefalse.php
@@ -38,11 +38,11 @@ function truefalse(array $config, \stdClass $event, \stdClass $questionattempt,
             ],
         ],
         'object' => [
-            'id' => $config['app_url'].'/question/question.php?cmid='.$coursemodule->id.'&id='.$question->id,
+            'id' => utils\get_quiz_question_id($config, $coursemodule->id, $question->id),
             'definition' => [
-                'type' => 'http://adlnet.gov/expapi/activities/question',
+                'type' => 'http://adlnet.gov/expapi/activities/cmi.interaction',
                 'name' => [
-                    $lang => $questionattempt->questionsummary,
+                    $lang => $question->questiontext,
                 ],
                 'interactionType' => 'true-false',
             ]
@@ -52,6 +52,9 @@ function truefalse(array $config, \stdClass $event, \stdClass $questionattempt,
             'response' => $questionattempt->responsesummary,
             'completion' => $questionattempt->responsesummary !== null,
             'success' => $questionattempt->rightanswer === $questionattempt->responsesummary,
+            'extensions' => [
+                'http://learninglocker.net/xapi/cmi/true-false/response' => $questionattempt->responsesummary === 'True',
+            ],
         ],
         'context' => [
             'platform' => $config['source_name'],
diff --git a/src/transformer/utils/get_quiz_question_id.php b/src/transformer/utils/get_quiz_question_id.php
new file mode 100644
index 0000000000000000000000000000000000000000..08708bac8a2d21efcb055e2ce9c4b260b601edcc
--- /dev/null
+++ b/src/transformer/utils/get_quiz_question_id.php
@@ -0,0 +1,22 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace src\transformer\utils;
+defined('MOODLE_INTERNAL') || die();
+
+function get_quiz_question_id(array $config, $coursemoduleid, $questionid) {
+    return $config['app_url'].'/question/question.php?cmid='.$coursemoduleid.'&id='.$questionid;
+}
diff --git a/tests/mod_quiz/attempt_submitted/essay/data.json b/tests/mod_quiz/attempt_submitted/essay/data.json
index fe479690e1fe8ec2932d12651fbc5b58874b8cf7..6ff3e26399a6fda990a5f08cc2b23326d750135b 100644
--- a/tests/mod_quiz/attempt_submitted/essay/data.json
+++ b/tests/mod_quiz/attempt_submitted/essay/data.json
@@ -52,14 +52,14 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "test_answer"
         }
     ],
     "question": [
         {
             "id": 1,
-            "qtype": "essay"
+            "qtype": "essay",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file
diff --git a/tests/mod_quiz/attempt_submitted/essay/statements.json b/tests/mod_quiz/attempt_submitted/essay/statements.json
index a89664ca48afc8fe2cceadf64342ef16707cada6..614c5640238d9d7c0b1b26f3dc6973afbddd27e0 100644
--- a/tests/mod_quiz/attempt_submitted/essay/statements.json
+++ b/tests/mod_quiz/attempt_submitted/essay/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
diff --git a/tests/mod_quiz/attempt_submitted/gapselect/data.json b/tests/mod_quiz/attempt_submitted/gapselect/data.json
index 4d3195e5e989d04ee8c230cbb5fb4596d9731157..d0563a5a9a3bac99e07566ecf8cd56854984cbe9 100644
--- a/tests/mod_quiz/attempt_submitted/gapselect/data.json
+++ b/tests/mod_quiz/attempt_submitted/gapselect/data.json
@@ -52,7 +52,6 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "Example [[1]] missing [[2]] words [[3]]\n; [[1]] -> {spicy / mango / milkshake}",
             "rightanswer": "{spicy} {mango} {milkshake}",
             "responsesummary": "{spicy} {mango} {milkshake}"
         }
diff --git a/tests/mod_quiz/attempt_submitted/gapselect/statements.json b/tests/mod_quiz/attempt_submitted/gapselect/statements.json
index a392781164fb93891d67dd1f41686db9ecc0ca50..d4663596613337caa907271340ed96534e6d1416 100644
--- a/tests/mod_quiz/attempt_submitted/gapselect/statements.json
+++ b/tests/mod_quiz/attempt_submitted/gapselect/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "<p>Example [[1]] missing [[2]] words [[3]]<\/p>"
                 },
@@ -119,7 +119,14 @@
         "result": {
             "response": "{spicy} {mango} {milkshake}",
             "completion": true,
-            "success": true
+            "success": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/sequencing\/response": [
+                    "spicy",
+                    "mango",
+                    "milkshake"
+                ]
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/match/data.json b/tests/mod_quiz/attempt_submitted/match/data.json
index 72c7d5e99d084ce88a3b614a78f2f9220d6f59fb..32f8b7d72fd523164bee5dfeba755124425a8748 100644
--- a/tests/mod_quiz/attempt_submitted/match/data.json
+++ b/tests/mod_quiz/attempt_submitted/match/data.json
@@ -52,8 +52,8 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "responsesummary": "Red\n-> Green; Blue\n-> Orange; Black\n-> White",
-            "rightanswer": "Red\n-> Green; Blue\n-> Orange; Black\n-> White"
+            "responsesummary": "Red\n -> Green; Blue\n -> Orange; Black\n -> White",
+            "rightanswer": "Red\n -> Green; Blue\n -> Orange; Black\n -> White"
         }
     ],
     "question": [
diff --git a/tests/mod_quiz/attempt_submitted/match/statements.json b/tests/mod_quiz/attempt_submitted/match/statements.json
index 5732df5cfebd1f9d2c88d97c4574f9d5e410f9f9..6fdeee5a1d3732653630e686a1cf9828a2c8c308 100644
--- a/tests/mod_quiz/attempt_submitted/match/statements.json
+++ b/tests/mod_quiz/attempt_submitted/match/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
@@ -117,9 +117,16 @@
         },
         "timestamp": "2015-06-10T15:31:41+01:00",
         "result": {
-            "response": "Red\n-> Green; Blue\n-> Orange; Black\n-> White",
+            "response": "Red\n -> Green; Blue\n -> Orange; Black\n -> White",
             "completion": true,
-            "success": true
+            "success": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/matching\/response": {
+                    "Red": "Green",
+                    "Blue": "Orange",
+                    "Black": "White"
+                }
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/multichoice/data.json b/tests/mod_quiz/attempt_submitted/multichoice/data.json
index e6201eb35bd4f5176cd297aeb15bbc001f680f1b..e9846f9401c31ffc742581438198afe3a48f55cd 100644
--- a/tests/mod_quiz/attempt_submitted/multichoice/data.json
+++ b/tests/mod_quiz/attempt_submitted/multichoice/data.json
@@ -52,14 +52,14 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "test_answer"
         }
     ],
     "question": [
         {
             "id": 1,
-            "qtype": "multichoice"
+            "qtype": "multichoice",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file
diff --git a/tests/mod_quiz/attempt_submitted/multichoice/statements.json b/tests/mod_quiz/attempt_submitted/multichoice/statements.json
index 2c41eba5986fa688b8eb39de5801b52b0be70ab7..27c8e9429ea2f27ec32126e8a2ddd685570ae674 100644
--- a/tests/mod_quiz/attempt_submitted/multichoice/statements.json
+++ b/tests/mod_quiz/attempt_submitted/multichoice/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
@@ -118,7 +118,10 @@
         "timestamp": "2015-06-10T15:31:41+01:00",
         "result": {
             "response": "test_answer",
-            "completion": true
+            "completion": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/choice\/response": "test_answer"
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/numerical/data.json b/tests/mod_quiz/attempt_submitted/numerical/data.json
index 44f713fab62cd32d31c0e8202de6112775fee251..060c62a3c5eaecbcf0da67b833169460df5fd65f 100644
--- a/tests/mod_quiz/attempt_submitted/numerical/data.json
+++ b/tests/mod_quiz/attempt_submitted/numerical/data.json
@@ -52,7 +52,6 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "1",
             "rightanswer": "1"
         }
@@ -60,7 +59,8 @@
     "question": [
         {
             "id": 1,
-            "qtype": "numerical"
+            "qtype": "numerical",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file
diff --git a/tests/mod_quiz/attempt_submitted/numerical/statements.json b/tests/mod_quiz/attempt_submitted/numerical/statements.json
index d0367e3e0cf8507fbdfdd2f10a4a6c627ec6c1ee..dc0344ad0c0072342e9367dfe68b15dba83d8d9c 100644
--- a/tests/mod_quiz/attempt_submitted/numerical/statements.json
+++ b/tests/mod_quiz/attempt_submitted/numerical/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
@@ -119,7 +119,10 @@
         "result": {
             "response": "1",
             "completion": true,
-            "success": true
+            "success": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/numeric\/response": 1
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/data.json b/tests/mod_quiz/attempt_submitted/randomsamatch/data.json
index 9df9bf3f45246469e48d82d800ee124702e1b142..54b1b517a63e8f8e07d99013499e146f6ffd0e31 100644
--- a/tests/mod_quiz/attempt_submitted/randomsamatch/data.json
+++ b/tests/mod_quiz/attempt_submitted/randomsamatch/data.json
@@ -52,8 +52,8 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "rightanswer": "Example short answer question\n-> orange; Testing testing\n-> Purple",
-            "responsesummary": "Example short answer question\n-> orange; Testing testing\n-> Purple"
+            "rightanswer": "Example short answer question\n -> orange; Testing testing\n -> Purple",
+            "responsesummary": "Example short answer question\n -> orange; Testing testing\n -> Purple"
         }
     ],
     "question": [
diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json b/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json
index 1076801522b75dfa4e5076e752355e9b4bee8d8c..c8a2cf5ac240c0acec7a564c70b00e5552d64208 100644
--- a/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json
+++ b/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "<p>Example Random short-answer matching question<br><\/p>"
                 },
@@ -117,9 +117,15 @@
         },
         "timestamp": "2015-06-10T15:31:41+01:00",
         "result": {
-            "response": "Example short answer question\n-> orange; Testing testing\n-> Purple",
+            "response": "Example short answer question\n -> orange; Testing testing\n -> Purple",
             "completion": true,
-            "success": true
+            "success": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/matching\/response": {
+                    "Example short answer question": "orange",
+                    "Testing testing": "Purple"
+                }
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/data.json b/tests/mod_quiz/attempt_submitted/shortanswer/data.json
index 5cdcd1d588423dce28e9c899190dcb4d4eebb66b..e0e9542fdbe7872a864c26234e6410c78f178bc0 100644
--- a/tests/mod_quiz/attempt_submitted/shortanswer/data.json
+++ b/tests/mod_quiz/attempt_submitted/shortanswer/data.json
@@ -52,14 +52,14 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "test_answer"
         }
     ],
     "question": [
         {
             "id": 1,
-            "qtype": "shortanswer"
+            "qtype": "shortanswer",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file
diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/statements.json b/tests/mod_quiz/attempt_submitted/shortanswer/statements.json
index c441f0b8f84b7a6bd914a5970287c39fae01a799..3b3b8ca0f72ffb13dce21197f2ee317452f42f01 100644
--- a/tests/mod_quiz/attempt_submitted/shortanswer/statements.json
+++ b/tests/mod_quiz/attempt_submitted/shortanswer/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
diff --git a/tests/mod_quiz/attempt_submitted/truefalse/data.json b/tests/mod_quiz/attempt_submitted/truefalse/data.json
index 8b78de3d2fc2d2ca7fd730f0c3240567cc9d3a31..1bdfa629c530a3b73709f215f6180939211617e4 100644
--- a/tests/mod_quiz/attempt_submitted/truefalse/data.json
+++ b/tests/mod_quiz/attempt_submitted/truefalse/data.json
@@ -52,7 +52,6 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "True",
             "rightanswer": "True"
         }
@@ -60,7 +59,8 @@
     "question": [
         {
             "id": 1,
-            "qtype": "truefalse"
+            "qtype": "truefalse",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file
diff --git a/tests/mod_quiz/attempt_submitted/truefalse/statements.json b/tests/mod_quiz/attempt_submitted/truefalse/statements.json
index 0fcf21a9d56b6a13abf373a28ac87da1864b848a..f1ba5dca2d12590e03b00cbe42bb78d90f28591f 100644
--- a/tests/mod_quiz/attempt_submitted/truefalse/statements.json
+++ b/tests/mod_quiz/attempt_submitted/truefalse/statements.json
@@ -108,7 +108,7 @@
         "object": {
             "id": "http:\/\/www.example.org\/question\/question.php?cmid=1&id=1",
             "definition": {
-                "type": "http:\/\/adlnet.gov\/expapi\/activities\/question",
+                "type": "http:\/\/adlnet.gov\/expapi\/activities\/cmi.interaction",
                 "name": {
                     "en": "test_question"
                 },
@@ -119,7 +119,10 @@
         "result": {
             "response": "True",
             "completion": true,
-            "success": true
+            "success": true,
+            "extensions": {
+                "http:\/\/learninglocker.net\/xapi\/cmi\/true-false\/response": true
+            }
         },
         "context": {
             "platform": "Moodle",
diff --git a/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json b/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json
index 7bb846932687667812408932992e38eba0645413..2a92a273e6221e9633d82c88f21e131979422016 100644
--- a/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json
+++ b/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json
@@ -52,14 +52,14 @@
             "id": 1,
             "questionusageid": 1,
             "questionid": 1,
-            "questionsummary": "test_question",
             "responsesummary": "test_answer"
         }
     ],
     "question": [
         {
             "id": 1,
-            "qtype": "unknown"
+            "qtype": "unknown",
+            "questiontext": "test_question"
         }
     ]
 }
\ No newline at end of file