diff --git a/pom.xml b/pom.xml
index e5fafe2c..d5bdc00a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
         <mockito-core.version>4.11.0</mockito-core.version>
         <mockito-junit-jupiter.version>4.8.0</mockito-junit-jupiter.version>
         <mongodb-driver.version>4.8.2</mongodb-driver.version>
-        <!--mongodb-driver.version>3.12.7</mongodb-driver.version-->
         <lombok.version>1.18.26</lombok.version>
         <hamcrest.version>1.3</hamcrest.version>
         <assertj.version>3.24.2</assertj.version>
@@ -108,12 +107,6 @@
             <version>${mongodb-driver.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver</artifactId>
-            <version>${mongodb-driver.version}</version>
-            <scope>compile</scope>
-        </dependency-->
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-core</artifactId>
@@ -237,6 +230,8 @@
                 <executions>
                     <execution>
                         <goals>
+                            <goal>addSources</goal>
+                            <goal>addTestSources</goal>
                             <goal>compile</goal>
                             <goal>compileTests</goal>
                         </goals>
@@ -308,7 +303,18 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/adminCommand.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createCollection.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/createIndex.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropCollection.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/dropIndex.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertMany.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/insertOne.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.json b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.xml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.xml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.xml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.xml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.yaml b/src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.yaml
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.yaml
rename to src/test/resources/liquibase/harness/compatibility/foundational/changelogs/nosql/runCommand.yaml
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/adminCommand.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/adminCommand.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/adminCommand.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/adminCommand.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createCollection.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createCollection.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createCollection.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createCollection.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createIndex.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createIndex.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createIndex.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/createIndex.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropCollection.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropCollection.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropCollection.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropCollection.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropIndex.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropIndex.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropIndex.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/dropIndex.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertMany.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertMany.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertMany.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertMany.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertOne.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertOne.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertOne.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/insertOne.json
diff --git a/src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/runCommand.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/runCommand.json
similarity index 100%
rename from src/main/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/runCommand.json
rename to src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/mongodb/runCommand.json