diff --git a/tests/behat/edit.feature b/tests/behat/edit.feature
index f22ee85..1415532 100644
--- a/tests/behat/edit.feature
+++ b/tests/behat/edit.feature
@@ -23,6 +23,9 @@ Feature: Test editing a Crossword question
 
   Scenario: Edit a Crossword question
     When I am on the "crossword-001" "core_question > edit" page logged in as teacher
+    And the following fields match these values:
+      | Question name | crossword-001           |
+      | Question text | Crossword question text |
     And I set the following fields to these values:
       | Question name |  |
     And I press "id_submitbutton"
diff --git a/tests/helper.php b/tests/helper.php
index dbcff5c..162a45b 100644
--- a/tests/helper.php
+++ b/tests/helper.php
@@ -77,7 +77,6 @@ public function make_crossword_question_normal() {
         $cw->numrows = 5;
         $cw->numcolumns = 7;
         $cw->accentgradingtype = qtype_crossword::ACCENT_GRADING_STRICT;
-        $cw->quotematching = 0;
         $cw->accentpenalty = 0;
         $cw->qtype = question_bank::get_qtype('crossword');
         $cw->generalfeedback = '';
@@ -175,7 +174,6 @@ public function get_crossword_question_form_data_normal() {
         $fromform->numcolumns = 7;
         $fromform->accentgradingtype = qtype_crossword::ACCENT_GRADING_STRICT;
         $fromform->accentpenalty = 0;
-        $fromform->questiontext = 0;
         $fromform->quotematching = 0;
         return $fromform;
     }