diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 8ac425d524d..d2b1f74aa11 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -14,175 +14,175 @@ jobs:
           distribution: 'temurin'
       - name: Build with Maven
         run: mvn clean install -DskipTests -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-  java-jdk11:
-    name: mvn clean install - jdk11
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-  java-jdk8:
-    name: mvn clean install - jdk8
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-  gremlin-server-default:
-    name: gremlin-server default
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j
-  gremlin-server-unified:
-    name: gremlin-server unified
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j -DtestUnified=true
-  spark-core:
-    name: spark core
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven Windows
-        if: runner.os == 'Windows'
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -DskipImageBuild -Dci
-      - name: Build with Maven Ubuntu
-        if: runner.os == 'Linux'
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=*IntegrateTest,!SparkGryoSerializerGraphComputerProcessIntegrateTest'
-  spark-gryo:
-    name: spark gryo
-    timeout-minutes: 45
-    needs: smoke
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven Windows
-        if: runner.os == 'Windows'
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -DskipImageBuild -Dci
-      - name: Build with Maven Ubuntu
-        if: runner.os == 'Linux'
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false -Dit.test=SparkGryoSerializerGraphComputerProcessIntegrateTest
-  gremlin-console:
-    name: gremlin-console
-    timeout-minutes: 20
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl :gremlin-console -DskipTests -DskipIntegrationTests=false
-  javascript:
-    name: javascript
-    timeout-minutes: 15
-    needs: smoke
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: |
-          mvn clean install -pl -:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
-          mvn verify -pl :gremlin-javascript,:gremlint -DincludeNeo4j
-  python:
-    name: python
-    timeout-minutes: 20
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Set up Python 3.x
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: Setup Python requirements
-        run: |
-          sudo apt install gcc libkrb5-dev
-          python3 -m pip install --upgrade pip
-          pip install virtualenv
-      - name: Build with Maven
-        run: |
-          touch gremlin-python/.glv
-          mvn clean install -pl -:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
-          mvn verify -pl gremlin-python -DincludeNeo4j
+#  java-jdk11:
+#    name: mvn clean install - jdk11
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+#  java-jdk8:
+#    name: mvn clean install - jdk8
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 8
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '8'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+#  gremlin-server-default:
+#    name: gremlin-server default
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j
+#  gremlin-server-unified:
+#    name: gremlin-server unified
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j -DtestUnified=true
+#  spark-core:
+#    name: spark core
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ${{ matrix.os }}
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest, windows-latest]
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven Windows
+#        if: runner.os == 'Windows'
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -DskipImageBuild -Dci
+#      - name: Build with Maven Ubuntu
+#        if: runner.os == 'Linux'
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=*IntegrateTest,!SparkGryoSerializerGraphComputerProcessIntegrateTest'
+#  spark-gryo:
+#    name: spark gryo
+#    timeout-minutes: 45
+#    needs: smoke
+#    runs-on: ${{ matrix.os }}
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest, windows-latest]
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven Windows
+#        if: runner.os == 'Windows'
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -DskipImageBuild -Dci
+#      - name: Build with Maven Ubuntu
+#        if: runner.os == 'Linux'
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false -Dit.test=SparkGryoSerializerGraphComputerProcessIntegrateTest
+#  gremlin-console:
+#    name: gremlin-console
+#    timeout-minutes: 20
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl :gremlin-console -DskipTests -DskipIntegrationTests=false
+#  javascript:
+#    name: javascript
+#    timeout-minutes: 15
+#    needs: smoke
+#    runs-on: ${{ matrix.os }}
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest, windows-latest]
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: |
+#          mvn clean install -pl -:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
+#          mvn verify -pl :gremlin-javascript,:gremlint -DincludeNeo4j
+#  python:
+#    name: python
+#    timeout-minutes: 20
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Set up Python 3.x
+#        uses: actions/setup-python@v4
+#        with:
+#          python-version: '3.8'
+#      - name: Setup Python requirements
+#        run: |
+#          sudo apt install gcc libkrb5-dev
+#          python3 -m pip install --upgrade pip
+#          pip install virtualenv
+#      - name: Build with Maven
+#        run: |
+#          touch gremlin-python/.glv
+#          mvn clean install -pl -:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint -q -DskipTests -Dci
+#          mvn verify -pl gremlin-python -DincludeNeo4j
   dotnet:
     name: .NET
     timeout-minutes: 20
@@ -206,49 +206,53 @@ jobs:
         run: |
           touch gremlin-dotnet/src/.glv
           touch gremlin-dotnet/test/.glv
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-:gremlint -q -DskipTests -Dci
+          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-:gremlint,-:gremlin-go -q -DskipTests -Dci
           mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet -DincludeNeo4j
-  neo4j-gremlin:
-    name: neo4j-gremlin
-    timeout-minutes: 20
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build with Maven
-        run: |
-          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
-          mvn verify -pl :neo4j-gremlin -DincludeNeo4j
-  go:
-    name: go
-    timeout-minutes: 20
-    needs: smoke
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.17'
-      - name: Generate Gremlin Server Base Image
-        working-directory: .
-        run: |
-          mvn clean install -pl gremlin-server -DskipTests -DskipIntegrationTests=true -Dci -am
-      - name: Build with Maven
-        working-directory: .
-        run: |
-          touch gremlin-go/.glv
-          mvn verify -pl :gremlin-go
       - name: Upload to Codecov
         uses: codecov/codecov-action@v3
         with:
-          working-directory: ./gremlin-go
-      - name: Go-Vet
-        working-directory: ./gremlin-go
-        run: go vet ./...
+          working-directory: ./gremlin-dotnet/test
+#  neo4j-gremlin:
+#    name: neo4j-gremlin
+#    timeout-minutes: 20
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK11
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '11'
+#          distribution: 'temurin'
+#      - name: Build with Maven
+#        run: |
+#          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
+#          mvn verify -pl :neo4j-gremlin -DincludeNeo4j
+#  go:
+#    name: go
+#    timeout-minutes: 20
+#    needs: smoke
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#      - name: Setup Go
+#        uses: actions/setup-go@v3
+#        with:
+#          go-version: '1.17'
+#      - name: Generate Gremlin Server Base Image
+#        working-directory: .
+#        run: |
+#          mvn clean install -pl gremlin-server -DskipTests -DskipIntegrationTests=true -Dci -am
+#      - name: Build with Maven
+#        working-directory: .
+#        run: |
+#          touch gremlin-go/.glv
+#          mvn verify -pl :gremlin-go
+#      - name: Upload to Codecov
+#        uses: codecov/codecov-action@v3
+#        with:
+#          working-directory: ./gremlin-go
+#      - name: Go-Vet
+#        working-directory: ./gremlin-go
+#        run: go vet ./...
diff --git a/gremlin-dotnet/Gremlin.Net.sln b/gremlin-dotnet/Gremlin.Net.sln
index 8816c761a7a..018ae20cbb1 100644
--- a/gremlin-dotnet/Gremlin.Net.sln
+++ b/gremlin-dotnet/Gremlin.Net.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.Template", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gremlin.Net.Template.IntegrationTest", "test\Gremlin.Net.Template.IntegrationTest\Gremlin.Net.Template.IntegrationTest.csproj", "{3BFC3559-E317-4327-AFB7-CFBB31E1C868}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gremlin.Net.Benchmarks", "test\Gremlin.Net.Benchmarks\Gremlin.Net.Benchmarks.csproj", "{7250A8B5-B962-49AB-B295-F75F8D4DBD78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gremlin.Net.BenchmarkTests", "test\Gremlin.Net.BenchmarkTests\Gremlin.Net.BenchmarkTests.csproj", "{7250A8B5-B962-49AB-B295-F75F8D4DBD78}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 893958cca74..70ad8d4eda9 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -26,6 +26,11 @@ limitations under the License.
     <artifactId>gremlin-dotnet</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net</name>
     <packaging>pom</packaging>
+    <properties>
+        <!-- provides a way to convert maven.test.skip value to skipTests for use in skipping dotnet tests -->
+        <maven.test.skip>false</maven.test.skip>
+        <skipTests>${maven.test.skip}</skipTests>
+    </properties>
 
     <modules>
         <module>src</module>
@@ -58,6 +63,9 @@ limitations under the License.
                 <groupId>org.eobjects.build</groupId>
                 <artifactId>dotnet-maven-plugin</artifactId>
                 <extensions>true</extensions>
+                <configuration>
+                    <skip>${skipTests}</skip>
+                </configuration>
             </plugin>
             <!--
             there is no point to deploying the jvm stuff - there is no java source really - just poms
@@ -70,15 +78,5 @@ limitations under the License.
                 </configuration>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eobjects.build</groupId>
-                    <artifactId>dotnet-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                    <version>0.24</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 </project>
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/CompressionBenchmarks.cs b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/CompressionBenchmarks.cs
similarity index 96%
rename from gremlin-dotnet/test/Gremlin.Net.Benchmarks/CompressionBenchmarks.cs
rename to gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/CompressionBenchmarks.cs
index ae933bfd67d..7097922da2f 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/CompressionBenchmarks.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/CompressionBenchmarks.cs
@@ -1,70 +1,70 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using System.Threading.Tasks;
-using Gremlin.Net.Driver;
-using Gremlin.Net.Driver.Remote;
-using Gremlin.Net.Structure.IO.GraphBinary;
-using Gremlin.Net.Structure.IO.GraphSON;
-using static Gremlin.Net.Process.Traversal.AnonymousTraversalSource;
-using static Gremlin.Net.Process.Traversal.__;
-
-namespace Gremlin.Net.Benchmarks;
-
-public class CompressionBenchmarks
-{
-    public static async Task GraphSONWithoutCompression()
-    {
-        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphSON3MessageSerializer(),
-            disableCompression: true);
-        await PerformBenchmarkWithClient(client);
-    }
-    
-    public static async Task GraphSONWithCompression()
-    {
-        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphSON3MessageSerializer());
-        await PerformBenchmarkWithClient(client);
-    }
-    
-    public static async Task GraphBinaryWithoutCompression()
-    {
-        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphBinaryMessageSerializer(),
-            disableCompression: true);
-        await PerformBenchmarkWithClient(client);
-    }
-    
-    public static async Task GraphBinaryWithCompression()
-    {
-        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphBinaryMessageSerializer());
-        await PerformBenchmarkWithClient(client);
-    }
-
-    private static async Task PerformBenchmarkWithClient(GremlinClient client)
-    {
-        var g = Traversal().WithRemote(new DriverRemoteConnection(client));
-        for (var i = 0; i < 5; i++)
-        {
-            await g.V().Repeat(Both()).Times(10).Emit().Fold().Promise(t => t.ToList());
-        }
-    }
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Threading.Tasks;
+using Gremlin.Net.Driver;
+using Gremlin.Net.Driver.Remote;
+using Gremlin.Net.Structure.IO.GraphBinary;
+using Gremlin.Net.Structure.IO.GraphSON;
+using static Gremlin.Net.Process.Traversal.AnonymousTraversalSource;
+using static Gremlin.Net.Process.Traversal.__;
+
+namespace Gremlin.Net.BenchmarkTests;
+
+public class CompressionBenchmarks
+{
+    public static async Task GraphSONWithoutCompression()
+    {
+        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphSON3MessageSerializer(),
+            disableCompression: true);
+        await PerformBenchmarkWithClient(client);
+    }
+    
+    public static async Task GraphSONWithCompression()
+    {
+        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphSON3MessageSerializer());
+        await PerformBenchmarkWithClient(client);
+    }
+    
+    public static async Task GraphBinaryWithoutCompression()
+    {
+        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphBinaryMessageSerializer(),
+            disableCompression: true);
+        await PerformBenchmarkWithClient(client);
+    }
+    
+    public static async Task GraphBinaryWithCompression()
+    {
+        var client = new GremlinClient(new GremlinServer("localhost", 45940), new GraphBinaryMessageSerializer());
+        await PerformBenchmarkWithClient(client);
+    }
+
+    private static async Task PerformBenchmarkWithClient(GremlinClient client)
+    {
+        var g = Traversal().WithRemote(new DriverRemoteConnection(client));
+        for (var i = 0; i < 5; i++)
+        {
+            await g.V().Repeat(Both()).Times(10).Emit().Fold().Promise(t => t.ToList());
+        }
+    }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Gremlin.Net.BenchmarkTests.csproj
similarity index 86%
rename from gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
rename to gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Gremlin.Net.BenchmarkTests.csproj
index d886eb74baa..e6952a74b69 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Gremlin.Net.BenchmarkTests.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
+        <RootNamespace>Gremlin.Net.Benchmarks</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/MessageSerializerBenchmarks.cs
similarity index 99%
rename from gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs
rename to gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/MessageSerializerBenchmarks.cs
index 500929acfba..73a148db179 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/MessageSerializerBenchmarks.cs
@@ -34,7 +34,7 @@
 using static Gremlin.Net.Process.Traversal.__;
 using static Gremlin.Net.Process.Traversal.P;
 
-namespace Gremlin.Net.Benchmarks
+namespace Gremlin.Net.BenchmarkTests
 {
     [MemoryDiagnoser]
     public class MessageSerializerBenchmarks
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Program.cs b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Program.cs
similarity index 97%
rename from gremlin-dotnet/test/Gremlin.Net.Benchmarks/Program.cs
rename to gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Program.cs
index 73ce83af901..3162cdff791 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Program.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/Program.cs
@@ -26,7 +26,7 @@
 using System.Threading.Tasks;
 using BenchmarkDotNet.Running;
 
-namespace Gremlin.Net.Benchmarks
+namespace Gremlin.Net.BenchmarkTests
 {
     public static class Program
     {
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/TestMessages.cs b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/TestMessages.cs
similarity index 99%
rename from gremlin-dotnet/test/Gremlin.Net.Benchmarks/TestMessages.cs
rename to gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/TestMessages.cs
index 68a1d2d932b..6da22fadd62 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/TestMessages.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.BenchmarkTests/TestMessages.cs
@@ -21,7 +21,7 @@
 
 #endregion
 
-namespace Gremlin.Net.Benchmarks
+namespace Gremlin.Net.BenchmarkTests
 {
     public class TestMessages
     {
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index a2956c573b6..981a2440762 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -11,6 +11,14 @@
     <ProjectReference Include="..\..\src\Gremlin.Net\Gremlin.Net.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="gherkin" Version="23.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
index ff066a902dd..e7b08ca987c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
@@ -5,6 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+      <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/appSettings.json b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/appSettings.json
new file mode 100644
index 00000000000..55f01082c2c
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/appSettings.json
@@ -0,0 +1,5 @@
+{
+  "TestServerIpAddress": "localhost",
+  "TestServerPort": 45940,
+  "TestSecureServerPort": 45941
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
index ec120fbce92..b1fe1767871 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -12,6 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 1991368e68e..787de1d4480 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -87,28 +87,6 @@ limitations under the License.
                 <directory>${basedir}/target</directory>
                 <finalName>${project.artifactId}-${project.version}</finalName>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eobjects.build</groupId>
-                        <artifactId>dotnet-maven-plugin</artifactId>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <skip>${skipTests}</skip>
-                            <!--
-                            transaction testing is disabled unless the -DincludeNeo4j flag enables the include-neo4j
-                            maven profile which is a standard profile we use to add neo4j to testing explicitly - for
-                            dotnet we set this TEST_TRANSACTIONS environment variable that can be accessed in tests to
-                            determine if we skip transaction oriented tests or not. without neo4j we can't test Tx()
-                            so this is disabled by default and enabled in the include-neo4j profile below
-                            -->
-                            <environment>
-                                <TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
-                            </environment>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.gmavenplus</groupId>
                         <artifactId>gmavenplus-plugin</artifactId>
@@ -223,6 +201,35 @@ limitations under the License.
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <version>1.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>run-tests</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>${skipTests}</skip>
+                                    <environmentVariables>
+                                        <TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
+                                    </environmentVariables>
+                                    <executable>dotnet</executable>
+                                    <workingDirectory>./..</workingDirectory>
+                                    <arguments>
+                                        <argument>test</argument>
+                                        <argument>./Gremlin.Net.sln</argument>
+                                        <argument>/p:CollectCoverage=true</argument>
+                                        <argument>/p:CoverletOutputFormat=opencover</argument>
+                                        <argument>/p:Exclude="[*Tests?]*"</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -245,13 +252,23 @@ limitations under the License.
                 <plugins>
                     <!-- with neo4j present we can enable transaction testing -->
                     <plugin>
-                        <groupId>org.eobjects.build</groupId>
-                        <artifactId>dotnet-maven-plugin</artifactId>
-                        <configuration>
-                            <environment>
-                                <TEST_TRANSACTIONS>true</TEST_TRANSACTIONS>
-                            </environment>
-                        </configuration>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <version>1.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>run-tests</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <environmentVariables>
+                                        <TEST_TRANSACTIONS>true</TEST_TRANSACTIONS>
+                                    </environmentVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.codehaus.gmavenplus</groupId>