diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
index dc2b609102c75e8c9d1ff6688fe477c6fa8ad47b..70a2c5eed405fc3d406ba705e624e21288a1c705 100755
--- a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
+++ b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
@@ -2553,25 +2553,17 @@ class TaskBlueprintTestCase(unittest.TestCase):
         response_data = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/%s/' % task_blueprint.id, 200)
         assertUrlList(self, response_data['subtasks'], [subtask_1, subtask_2])
 
-    @unittest.skip("This test is dependend on previous tests (in the results list). ToDo: fix it.")
     def test_TaskBlueprint_contains_lists_of_related_TaskRelationBlueprint(self):
 
         # setup
-        test_data_1 = TaskBlueprint_test_data()
-        test_data_2 = TaskBlueprint_test_data()
-        trbt_test_data_1 = TaskRelationBlueprint_test_data()
-        trbt_test_data_2 = TaskRelationBlueprint_test_data()
-        task_blueprint = models.TaskBlueprint.objects.create(**test_data_1)
-        task_relation_blueprint_1 = models.TaskRelationBlueprint.objects.create(**trbt_test_data_1)
-        task_relation_blueprint_1.producer = task_blueprint
-        task_relation_blueprint_1.save()
-        task_relation_blueprint_2 = models.TaskRelationBlueprint.objects.create(**trbt_test_data_2)
-        task_relation_blueprint_2.consumer = task_blueprint
-        task_relation_blueprint_2.save()
+        task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())
+        task_relation_blueprint_1 = models.TaskRelationBlueprint.objects.create(**TaskRelationBlueprint_test_data(producer=task_blueprint))
+        task_relation_blueprint_2 = models.TaskRelationBlueprint.objects.create(**TaskRelationBlueprint_test_data(consumer=task_blueprint))
+
         # assert
         response_data = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/%s/' % task_blueprint.id, 200)
-        assertUrlList(self, response_data['produced_by'], [task_relation_blueprint_1])
-        assertUrlList(self, response_data['consumed_by'], [task_relation_blueprint_2])
+        assertUrlList(self, response_data['consumed_by'], [task_relation_blueprint_1])
+        assertUrlList(self, response_data['produced_by'], [task_relation_blueprint_2])
 
     def test_TaskBlueprint_filters_for_SchedulingUnitBlueprint(self):
 
@@ -2604,13 +2596,35 @@ class TaskBlueprintTestCase(unittest.TestCase):
         self.assertIn(task_blueprint_2.name, str(response_4))
         self.assertNotIn(task_blueprint_3.name, str(response_4))
 
-    # todo: draft
+    def test_TaskBlueprint_filters_for_TaskDraft(self):
+
+        # setup
+        task_draft_1 = models.TaskDraft.objects.create(**TaskDraft_test_data("td_%s" % uuid.uuid4()))
+        task_draft_2 = models.TaskDraft.objects.create(**TaskDraft_test_data("td_%s" % uuid.uuid4()))
+        task_draft_3 = models.TaskDraft.objects.create(**TaskDraft_test_data("td_%s" % uuid.uuid4()))
+        task_blueprint_1 = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(name="tb_%s" % uuid.uuid4(), task_draft=task_draft_1))
+        task_blueprint_2 = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(name="tb_%s" % uuid.uuid4(), task_draft=task_draft_2))
+        task_blueprint_3 = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(name="tb_%s" % uuid.uuid4(), task_draft=task_draft_3))
+
+        #  assert
+        response_1 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?draft=%s' % task_draft_1.id, 200)
+        response_2 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?draft_min=%s&draft_max=%s' % (task_draft_2.id, task_draft_2.id), 200)
+        response_3 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?draft=%s,%s' % (task_draft_1.id, task_draft_3.id), 200)
+        GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?draft=%s' % 9999999, 400)
+        self.assertIn(task_blueprint_1.name, str(response_1))
+        self.assertNotIn(task_blueprint_2.name, str(response_1))
+        self.assertNotIn(task_blueprint_3.name, str(response_1))
+        self.assertNotIn(task_blueprint_1.name, str(response_2))
+        self.assertIn(task_blueprint_2.name, str(response_2))
+        self.assertNotIn(task_blueprint_3.name, str(response_2))
+        self.assertIn(task_blueprint_1.name, str(response_3))
+        self.assertNotIn(task_blueprint_2.name, str(response_3))
+        self.assertIn(task_blueprint_3.name, str(response_3))
 
     # todo: control ID
 
     # todo: status
 
-    # todo:
 
 class TaskRelationBlueprintTestCase(unittest.TestCase):