diff --git a/SAS/TMSS/test/t_scheduling.py b/SAS/TMSS/test/t_scheduling.py
index c52ae56ed47dfa46c0a30a0b04f93e95a566dc3d..f0afff19c641c657a6479f9969abe79738464165 100755
--- a/SAS/TMSS/test/t_scheduling.py
+++ b/SAS/TMSS/test/t_scheduling.py
@@ -24,7 +24,7 @@ import unittest
 from unittest import mock
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger('lofar'+__name__)
 logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
 
 from lofar.common.test_utils import skip_integration_tests
@@ -465,8 +465,8 @@ class SAPTest(unittest.TestCase):
             subtask = client.schedule_subtask(subtask_id)
 
             self.assertEqual(1, subtask_model.output_dataproducts.values('sap').count())
-            self.assertEqual(models.SAP.objects.first().specifications_doc['pointing']['angle1'], pointing['angle1'])
-            self.assertEqual(models.SAP.objects.first().specifications_doc['pointing']['angle2'], pointing['angle2'])
+            self.assertEqual(subtask_model.output_dataproducts.first().sap.specifications_doc['pointing']['angle1'], pointing['angle1'])
+            self.assertEqual(subtask_model.output_dataproducts.first().sap.specifications_doc['pointing']['angle2'], pointing['angle2'])
 
     @mock.patch("lofar.sas.tmss.tmss.tmssapp.subtasks.assign_or_unassign_resources")
     def test_schedule_pipeline_subtask_copies_sap_from_input_to_output(self, assign_resources_mock):
@@ -575,22 +575,24 @@ class TestWithUC1Specifications(unittest.TestCase):
     def test_create_task_blueprints_and_subtasks_from_scheduling_unit_draft(self):
         """
         Create Task Blueprints and Subtasks (class setup)
-        Check if tasks (7) are created:
+        Check if tasks (8) are created:
            Calibration 1     : 1 Observation and 1 Pipeline task
            Target Observation: 1 Observation and 2 Pipeline tasks
            Calibration 2     : 1 Observation and 1 Pipeline task
+           Ingest            : 1 ingest task
         Check if subtasks (13) are created:
            Every Observation Task: 3 subtasks (1 control, 2 QA)
            Every Pipeline Task:    1 subtasks (1 control)
+           Every Ingest Task:      1 subtasks (1 control)
            makes 3x3 + 4x1 = 13
         """
-        self.assertEqual(7, len(self.task_drafts))
+        self.assertEqual(8, len(self.task_drafts))
         self.assertEqual(1, len(self.scheduling_unit_blueprints))
-        self.assertEqual(7, len(self.task_blueprints))
+        self.assertEqual(8, len(self.task_blueprints))
         total_subtasks = 0
         for task_blueprint in self.task_blueprints:
             total_subtasks += task_blueprint.subtasks.count()
-        self.assertEqual(13, total_subtasks)
+        self.assertEqual(14, total_subtasks)
 
     def test_relative_times(self):
         """