diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index c44856a56..5b6449839 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -161,6 +161,9 @@
 
         <!-- OpenLineage java -->
         <version.open.lineage.java>1.23.0</version.open.lineage.java>
+
+        <!-- Used for pinning version specifically test-mda-model-->
+        <version.test.resteasy>3.15.6.Final</version.test.resteasy>
     </properties>
 
     <dependencyManagement>
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pom.xml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pom.xml
index 5a5c12f13..f40f70dc8 100644
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pom.xml
+++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pom.xml
@@ -87,11 +87,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${version.exec.maven.plugin}</version>
                 <executions>
                     <execution>
                         <id>test-chart</id>
@@ -104,10 +103,7 @@
                             <arguments>
                                 <argument>template</argument>
                                 <argument>aissemble-spark-application-chart</argument>
-                                <argument>--repo</argument>
-                                <argument>${aissemble.helm.repo}</argument>
-                                <argument>--version</argument>
-                                <argument>${version.aissemble}</argument>
+                                <argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
                                 <argument>--values</argument>
                                 <argument>
                                     src/aissemble_test_data_delivery_pyspark_model_basic/resources/apps/pyspark-data-delivery-basic-base-values.yaml,tests/resources/apps/pyspark-data-delivery-basic-test-values.yaml
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pom.xml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pom.xml
index d4e4ed2a6..7f8c2205b 100644
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pom.xml
+++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pom.xml
@@ -92,7 +92,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -109,10 +108,7 @@
                             <arguments>
                                 <argument>template</argument>
                                 <argument>aissemble-spark-application-chart</argument>
-                                <argument>--repo</argument>
-                                <argument>${aissemble.helm.repo}</argument>
-                                <argument>--version</argument>
-                                <argument>${version.aissemble}</argument>
+                                <argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
                                 <argument>--values</argument>
                                 <argument>
                                     src/aissemble_test_data_delivery_pyspark_model/resources/apps/pyspark-data-delivery-patterns-base-values.yaml,tests/resources/apps/pyspark-data-delivery-patterns-test-values.yaml
diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/steps/filestore_steps.py b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/steps/filestore_steps.py
index bde9ce214..95a112111 100644
--- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/steps/filestore_steps.py
+++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/features/steps/filestore_steps.py
@@ -10,7 +10,7 @@
 import os
 import nose.tools as nt
 from behave import given, when, then  # pylint: disable=no-name-in-module
-from aiops_core_filestore.file_store_factory import FileStoreFactory
+from aissemble_core_filestore.file_store_factory import FileStoreFactory
 from libcloud.utils.py3 import httplib
 from krausening.logging import LogManager
 
diff --git a/test/test-mda-models/pom.xml b/test/test-mda-models/pom.xml
index ce56bf6b7..66c26a567 100644
--- a/test/test-mda-models/pom.xml
+++ b/test/test-mda-models/pom.xml
@@ -78,38 +78,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <profiles>
-        <profile>
-            <!-- NB: Temp workaround until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <!-- Skip helm test-chart generation during a release, since the necessary helm charts won't be published -->
-            <id>skip-helm</id>
-            <properties>
-                <!-- skip tests since they rely on the generated test SparkApplication yaml that we are disabling -->
-                <skipTests>true</skipTests>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>${version.exec.maven.plugin}</version>
-                        <executions>
-                            <execution>
-                                <id>test-chart</id>
-                                <configuration>
-                                    <skip>true</skip>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
index e27ffb2c9..63f0b2b3f 100644
--- a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
+++ b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
@@ -64,7 +64,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
-            <!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
+            <!--TODO: 3 steps are disabled and shall be available once https://github.com/boozallen/aissemble/issues/430 is resolved: : -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -81,10 +81,7 @@
                             <arguments>
                                 <argument>template</argument>
                                 <argument>aissemble-spark-application-chart</argument>
-                                <argument>--repo</argument>
-                                <argument>${aissemble.helm.repo}</argument>
-                                <argument>--version</argument>
-                                <argument>${version.aissemble}</argument>
+                                <argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
                                 <argument>--values</argument>
                                 <argument>
                                     src/main/resources/apps/spark-java-data-delivery-basic-base-values.yaml,src/test/resources/apps/spark-java-data-delivery-basic-test-values.yaml
@@ -239,5 +236,17 @@
             <version>${version.cucumber.reporting.plugin}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <version>${version.test.resteasy}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-aws</artifactId>
+            <version>${version.hadoop}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/test/test-mda-models/test-data-delivery-spark-model/pom.xml b/test/test-mda-models/test-data-delivery-spark-model/pom.xml
index fe205866e..473e13030 100644
--- a/test/test-mda-models/test-data-delivery-spark-model/pom.xml
+++ b/test/test-mda-models/test-data-delivery-spark-model/pom.xml
@@ -73,7 +73,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
-            <!--NB: inactive by default until https://github.com/boozallen/aissemble/issues/4 is resolved: -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -90,10 +89,7 @@
                             <arguments>
                                 <argument>template</argument>
                                 <argument>aissemble-spark-application-chart</argument>
-                                <argument>--repo</argument>
-                                <argument>${aissemble.helm.repo}</argument>
-                                <argument>--version</argument>
-                                <argument>${version.aissemble}</argument>
+                                <argument>${project.basedir}/../../../extensions/extensions-helm/aissemble-spark-application-chart</argument>
                                 <argument>--values</argument>
                                 <argument>
                                     src/main/resources/apps/spark-java-data-delivery-patterns-base-values.yaml,src/test/resources/apps/spark-java-data-delivery-patterns-test-values.yaml
@@ -248,5 +244,17 @@
             <version>${version.cucumber.reporting.plugin}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <version>${version.test.resteasy}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-aws</artifactId>
+            <version>${version.hadoop}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/test/test-mda-models/test-data-delivery-spark-model/src/main/resources/pipelines/SparkJavaDataDeliveryPatterns.json b/test/test-mda-models/test-data-delivery-spark-model/src/main/resources/pipelines/SparkJavaDataDeliveryPatterns.json
index ef4ad7ce9..4c4e820c3 100644
--- a/test/test-mda-models/test-data-delivery-spark-model/src/main/resources/pipelines/SparkJavaDataDeliveryPatterns.json
+++ b/test/test-mda-models/test-data-delivery-spark-model/src/main/resources/pipelines/SparkJavaDataDeliveryPatterns.json
@@ -68,14 +68,6 @@
 				"channelName": "outboundChannel"
 			}
 		},
-		{
-			"name": "VoidInboundAndMessagingOutboundAsync",
-			"type": "asynchronous",
-			"outbound": {
-				"type": "messaging",
-				"channelName": "outboundChannel"
-			}
-		},
 		{
 			"name": "MessagingInboundAndVoidOutbound",
 			"type": "synchronous",
@@ -402,18 +394,6 @@
 				}
 			}
 		},
-		{
-			"name": "MessagingOutboundWithCustomTypesAsync",
-			"type": "asynchronous",
-			"outbound": {
-				"type": "messaging",
-				"channelName": "outboundChannel",
-				"recordType": {
-					"name": "CustomRecord",
-					"package": "com.boozallen.aiops.mda.pattern.record"
-				}
-			}
-		},
 		{
 			"name": "MessagingOutboundWithCustomRec",
 			"type": "synchronous",
@@ -426,18 +406,6 @@
 				}
 			}
 		},
-		{
-			"name": "MessagingOutboundWithCustomRecAsync",
-			"type": "asynchronous",
-			"outbound": {
-				"type": "messaging",
-				"channelName": "outboundChannel",
-				"recordType": {
-					"name": "CustomRec",
-					"package": "com.boozallen.aiops.mda.pattern.record"
-				}
-			}
-		},
 		{
 			"name": "MessagingInboundWithCustomRec",
 			"type": "synchronous",