diff --git a/SAS/TMSS/backend/test/tmss_test_data_django_models.py b/SAS/TMSS/backend/test/tmss_test_data_django_models.py
index 155e9a982bf7773c466889c61afab2a51fc7ed57..1e4f10473ee3a7bc9eee437f6b88ed0052516a5c 100644
--- a/SAS/TMSS/backend/test/tmss_test_data_django_models.py
+++ b/SAS/TMSS/backend/test/tmss_test_data_django_models.py
@@ -425,7 +425,8 @@ def Dataproduct_test_data(producer: models.SubtaskOutput=None,
                           specifications_doc: object=None,
                           specifications_template: models.DataproductSpecificationsTemplate=None,
                           feedback_doc: object = None,
-                          feedback_template: models.DataproductFeedbackTemplate = None) -> dict:
+                          feedback_template: models.DataproductFeedbackTemplate = None,
+                          sap: models.SAP = None) -> dict:
 
     if filename is None:
         filename = "my_file_%s.ext" % uuid.uuid4()
@@ -454,6 +455,9 @@ def Dataproduct_test_data(producer: models.SubtaskOutput=None,
     if feedback_doc is None:
         feedback_doc = get_default_json_object_for_schema(feedback_template.schema)
 
+    if sap is None:
+        sap = models.SAP.objects.create(**SAP_test_data())
+
     return {"filename": filename,
             "directory": directory,
             "dataformat": dataformat,
@@ -467,7 +471,7 @@ def Dataproduct_test_data(producer: models.SubtaskOutput=None,
             "size": 123,
             "feedback_doc": feedback_doc,
             "feedback_template": feedback_template,
-            "sap": models.SAP.objects.create(**SAP_test_data()),
+            "sap": sap,
             "global_identifier": models.SIPidentifier.objects.create(source="TMSS")}
 
 def AntennaSet_test_data() -> dict: