diff --git a/tests/integration/hosts/aftereffects/lib.py b/tests/integration/hosts/aftereffects/lib.py
index c47121a035..08dda1d499 100644
--- a/tests/integration/hosts/aftereffects/lib.py
+++ b/tests/integration/hosts/aftereffects/lib.py
@@ -19,7 +19,7 @@ class AEHostFixtures(HostFixtures):
         src_path = os.path.join(download_test_data,
                                 "input",
                                 "workfile",
-                                "test_project_test_asset_TestTask_v001.aep")
+                                "test_project_test_asset_test_task_v001.aep")
         dest_folder = os.path.join(output_folder_url,
                                    self.PROJECT,
                                    self.ASSET,
@@ -27,7 +27,7 @@ class AEHostFixtures(HostFixtures):
                                    self.TASK)
         os.makedirs(dest_folder)
         dest_path = os.path.join(dest_folder,
-                                 "test_project_test_asset_TestTask_v001.aep")
+                                 "test_project_test_asset_test_task_v001.aep")
         shutil.copy(src_path, dest_path)
 
         yield dest_path
diff --git a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
index 2c88f8d801..c820a3cab8 100644
--- a/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_deadline_publish_in_aftereffects.py
@@ -51,27 +51,41 @@ class TestDeadlinePublishInAfterEffects(AEDeadlinePublishTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        failures.append(
-            DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="imageMainBackgroundcopy"))
-
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="reviewTesttask"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTestTaskDefault",
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "context.ext": "aep"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     additional_args=additional_args))
 
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "thumbnail"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "h264_png"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
         assert not any(failures)
 
 
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
index dc7c9c608d..b4c072a0e4 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects.py
@@ -49,27 +49,41 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        failures.append(
-            DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="imageMainBackgroundcopy"))
-
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="reviewTesttask"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTestTaskDefault",
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "context.ext": "aep"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     additional_args=additional_args))
 
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "thumbnail"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "h264_png"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
         assert not any(failures)
 
 
diff --git a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
index 9c5a8de0d1..2d95eada99 100644
--- a/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
+++ b/tests/integration/hosts/aftereffects/test_publish_in_aftereffects_multiframe.py
@@ -9,7 +9,7 @@ log = logging.getLogger("test_publish_in_aftereffects")
 class TestPublishInAfterEffects(AELocalPublishTestClass):
     """Basic test case for publishing in AfterEffects
 
-    Should publish 5 frames
+    Should publish 10 frames
     """
     PERSIST = True
 
@@ -36,27 +36,41 @@ class TestPublishInAfterEffects(AELocalPublishTestClass):
         failures.append(
             DBAssert.count_of_types(dbcon, "version", 0, name={"$ne": 1}))
 
-        failures.append(
-            DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="imageMainBackgroundcopy"))
-
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
                                     name="workfileTest_task"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "subset", 1,
-                                    name="reviewTesttask"))
+                                    name="renderTest_taskMain"))
 
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 4))
 
-        additional_args = {"context.subset": "renderTestTaskDefault",
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "context.ext": "aep"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
                            "context.ext": "png"}
         failures.append(
             DBAssert.count_of_types(dbcon, "representation", 1,
                                     additional_args=additional_args))
 
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "thumbnail"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
+        additional_args = {"context.subset": "renderTest_taskMain",
+                           "name": "h264_png"}
+        failures.append(
+            DBAssert.count_of_types(dbcon, "representation", 1,
+                                    additional_args=additional_args))
+
         assert not any(failures)