diff --git a/externallib.php b/externallib.php
index 70371e80..7715fc1e 100644
--- a/externallib.php
+++ b/externallib.php
@@ -26,6 +26,8 @@
 
 namespace mod_questionnaire;
 
+defined('MOODLE_INTERNAL') || die();
+
 require_once($CFG->libdir . '/externallib.php');
 
 use external_api;
diff --git a/tests/csvexport_test.php b/tests/csvexport_test.php
index f8e9badb..eeb12d88 100644
--- a/tests/csvexport_test.php
+++ b/tests/csvexport_test.php
@@ -89,6 +89,8 @@ public function test_csvexport() {
 
     /**
      * Tests the CSV export with identity fields and anonymous questionnaires.
+     *
+     * @covers ::csvexport
      */
     public function test_csvexport_identity_fields() {
         global $DB;
@@ -147,7 +149,7 @@ private function do_test_csvexport_identity_fields($course, $cm, $user, $roleid,
         assign_capability('moodle/site:viewuseridentity', CAP_ALLOW, $roleid, $context);
 
         // Generate CSV output.
-        $questionnaire = new questionnaire($course, $cm, $item->id);
+        $questionnaire = new \questionnaire($course, $cm, $item->id);
         $output = $questionnaire->generate_csv(0, '', '', 0, 0, 1);
 
         $this->assertNotNull($output);