diff --git a/mod/imscp/tests/packages/singlescobasic.zip b/mod/imscp/tests/packages/singlescobasic.zip
new file mode 100644
index 00000000000..24ce3e38060
Binary files /dev/null and b/mod/imscp/tests/packages/singlescobasic.zip differ
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index fd23bd3475b..37bdd79d269 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -126,10 +126,10 @@ function scorm_add_instance($scorm, $mform=null) {
 
     // Store the package and verify.
     if ($record->scormtype === SCORM_TYPE_LOCAL) {
-        if ($mform && $data = $mform->get_data()) {
+        if (!empty($scorm->packagefile)) {
             $fs = get_file_storage();
             $fs->delete_area_files($context->id, 'mod_scorm', 'package');
-            file_save_draft_area_files($data->packagefile, $context->id, 'mod_scorm', 'package',
+            file_save_draft_area_files($scorm->packagefile, $context->id, 'mod_scorm', 'package',
                 0, array('subdirs' => 0, 'maxfiles' => 1));
             // Get filename of zip that was uploaded.
             $files = $fs->get_area_files($context->id, 'mod_scorm', 'package', 0, '', false);
@@ -202,10 +202,10 @@ function scorm_update_instance($scorm, $mform=null) {
     $context = context_module::instance($cmid);
 
     if ($scorm->scormtype === SCORM_TYPE_LOCAL) {
-        if ($mform && $data = $mform->get_data()) {
+        if (!empty($scorm->packagefile)) {
             $fs = get_file_storage();
             $fs->delete_area_files($context->id, 'mod_scorm', 'package');
-            file_save_draft_area_files($data->packagefile, $context->id, 'mod_scorm', 'package',
+            file_save_draft_area_files($scorm->packagefile, $context->id, 'mod_scorm', 'package',
                 0, array('subdirs' => 0, 'maxfiles' => 1));
             // Get filename of zip that was uploaded.
             $files = $fs->get_area_files($context->id, 'mod_scorm', 'package', 0, '', false);
diff --git a/mod/scorm/tests/generator/lib.php b/mod/scorm/tests/generator/lib.php
new file mode 100644
index 00000000000..9b2f6085fa2
--- /dev/null
+++ b/mod/scorm/tests/generator/lib.php
@@ -0,0 +1,97 @@
+<?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/>.
+
+/**
+ * mod_scorm data generator.
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2013 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * mod_scorm data generator class.
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2013 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_scorm_generator extends testing_module_generator {
+
+    public function create_instance($record = null, array $options = null) {
+        global $CFG, $USER;
+        require_once($CFG->dirroot.'/mod/scorm/lib.php');
+        require_once($CFG->dirroot.'/mod/scorm/locallib.php');
+        $cfgscorm = get_config('scorm');
+
+        // Add default values for scorm.
+        $record = (array)$record + array(
+            'scormtype' => SCORM_TYPE_LOCAL,
+            'packagefile' => '',
+            'packagefilepath' => $CFG->dirroot.'/mod/scorm/tests/packages/singlescobasic.zip',
+            'packageurl' => '',
+            'updatefreq' => SCORM_UPDATE_NEVER,
+            'popup' => 0,
+            'width' => $cfgscorm->framewidth,
+            'height' => $cfgscorm->frameheight,
+            'skipview' => $cfgscorm->skipview,
+            'hidebrowse' => $cfgscorm->hidebrowse,
+            'displaycoursestructure' => $cfgscorm->displaycoursestructure,
+            'hidetoc' => $cfgscorm->hidetoc,
+            'nav' => $cfgscorm->nav,
+            'navpositionleft' => $cfgscorm->navpositionleft,
+            'navpositiontop' => $cfgscorm->navpositiontop,
+            'displayattemptstatus' => $cfgscorm->displayattemptstatus,
+            'timeopen' => 0,
+            'timeclose' => 0,
+            'grademethod' => GRADESCOES,
+            'maxgrade' => $cfgscorm->maxgrade,
+            'maxattempt' => $cfgscorm->maxattempt,
+            'whatgrade' => $cfgscorm->whatgrade,
+            'forcenewattempt' => $cfgscorm->forcenewattempt,
+            'lastattemptlock' => $cfgscorm->lastattemptlock,
+            'forcecompleted' => $cfgscorm->forcecompleted,
+            'auto' => $cfgscorm->auto
+        );
+
+        // The 'packagefile' value corresponds to the draft file area ID. If not specified, create from packagefilepath.
+        if (empty($record['packagefile']) && $record['scormtype'] === SCORM_TYPE_LOCAL) {
+            if (!isloggedin() || isguestuser()) {
+                throw new coding_exception('Scorm generator requires a current user');
+            }
+            if (!file_exists($record['packagefilepath'])) {
+                throw new coding_exception("File {$record['packagefilepath']} does not exist");
+            }
+            $usercontext = context_user::instance($USER->id);
+
+            // Pick a random context id for specified user.
+            $record['packagefile'] = file_get_unused_draft_itemid();
+
+            // Add actual file there.
+            $filerecord = array('component' => 'user', 'filearea' => 'draft',
+                    'contextid' => $usercontext->id, 'itemid' => $record['packagefile'],
+                    'filename' => basename($record['packagefilepath']), 'filepath' => '/');
+            $fs = get_file_storage();
+            $fs->create_file_from_pathname($filerecord, $record['packagefilepath']);
+        }
+
+        return parent::create_instance($record, (array)$options);
+    }
+}
diff --git a/mod/scorm/tests/generator_test.php b/mod/scorm/tests/generator_test.php
new file mode 100644
index 00000000000..1e984875045
--- /dev/null
+++ b/mod/scorm/tests/generator_test.php
@@ -0,0 +1,76 @@
+<?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/>.
+
+/**
+ * mod_scorm generator tests
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2013 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Genarator tests class for mod_scorm.
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2013 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_scorm_generator_testcase extends advanced_testcase {
+
+    public function test_create_instance() {
+        global $DB, $CFG, $USER;
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $course = $this->getDataGenerator()->create_course();
+
+        $this->assertFalse($DB->record_exists('scorm', array('course' => $course->id)));
+        $scorm = $this->getDataGenerator()->create_module('scorm', array('course' => $course));
+        $records = $DB->get_records('scorm', array('course' => $course->id), 'id');
+        $this->assertEquals(1, count($records));
+        $this->assertTrue(array_key_exists($scorm->id, $records));
+
+        $params = array('course' => $course->id, 'name' => 'Another scorm');
+        $scorm = $this->getDataGenerator()->create_module('scorm', $params);
+        $records = $DB->get_records('scorm', array('course' => $course->id), 'id');
+        $this->assertEquals(2, count($records));
+        $this->assertEquals('Another scorm', $records[$scorm->id]->name);
+
+        // Examples of specifying the package file (do not validate anything, just check for exceptions).
+        // 1. As path to the file in filesystem:
+        $params = array(
+            'course' => $course->id,
+            'packagefilepath' => $CFG->dirroot.'/mod/scorm/tests/packages/singlescobasic.zip'
+        );
+        $scorm = $this->getDataGenerator()->create_module('scorm', $params);
+
+        // 2. As file draft area id:
+        $fs = get_file_storage();
+        $params = array(
+            'course' => $course->id,
+            'packagefile' => file_get_unused_draft_itemid()
+        );
+        $usercontext = context_user::instance($USER->id);
+        $filerecord = array('component' => 'user', 'filearea' => 'draft',
+                'contextid' => $usercontext->id, 'itemid' => $params['packagefile'],
+                'filename' => 'singlescobasic.zip', 'filepath' => '/');
+        $fs->create_file_from_pathname($filerecord, $CFG->dirroot.'/mod/scorm/tests/packages/singlescobasic.zip');
+        $scorm = $this->getDataGenerator()->create_module('scorm', $params);
+    }
+}