diff --git a/classes/step.php b/classes/step.php
index 78b6e4f4..f15df3d7 100644
--- a/classes/step.php
+++ b/classes/step.php
@@ -57,6 +57,9 @@ class step extends persistent {
     /** @var array array for lazy loading step dependants */
     private $dependents = null;
 
+    /** @var dataflow Dataflow */
+    private $dataflow = null;
+
     /**
      * Return the definition of the properties of this model.
      *
diff --git a/tests/tool_dataflows_event_processor_test.php b/tests/tool_dataflows_event_processor_test.php
index 6633a349..bf0ac016 100644
--- a/tests/tool_dataflows_event_processor_test.php
+++ b/tests/tool_dataflows_event_processor_test.php
@@ -35,6 +35,37 @@
  */
 class tool_dataflows_event_processor_test extends \advanced_testcase {
 
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test course.
+     *
+     * @var \stdClass
+     */
+    protected $course;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
     /**
      * Set up before each test
      */
diff --git a/tests/tool_dataflows_flow_sql_test.php b/tests/tool_dataflows_flow_sql_test.php
index 9a21bee1..7765708e 100644
--- a/tests/tool_dataflows_flow_sql_test.php
+++ b/tests/tool_dataflows_flow_sql_test.php
@@ -34,6 +34,41 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class tool_dataflows_flow_sql_test extends \advanced_testcase {
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test input path.
+     * @var false|string
+     */
+    protected $inputpath;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
+    /**
+     * Test flow step.
+     * @var \tool_dataflows\step
+     */
+    protected $flow;
 
     /**
      * Set up before each test
diff --git a/tests/tool_dataflows_json_reader_test.php b/tests/tool_dataflows_json_reader_test.php
index d6ff8f3b..d834cd0b 100644
--- a/tests/tool_dataflows_json_reader_test.php
+++ b/tests/tool_dataflows_json_reader_test.php
@@ -36,6 +36,42 @@
  */
 class tool_dataflows_json_reader_test extends \advanced_testcase {
 
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test input path.
+     * @var false|string
+     */
+    protected $inputpath;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
+    /**
+     * Test users.
+     * @var
+     */
+    protected $users;
+
     /**
      * Set up before each test
      */
diff --git a/tests/tool_dataflows_reader_csv_test.php b/tests/tool_dataflows_reader_csv_test.php
index 7d2791f9..55a2d8eb 100644
--- a/tests/tool_dataflows_reader_csv_test.php
+++ b/tests/tool_dataflows_reader_csv_test.php
@@ -35,6 +35,17 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class tool_dataflows_reader_csv_test extends \advanced_testcase {
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
 
     /**
      * Set up before each test