Merged the integ-test and e2e-test steps

Signed-off-by: Norman Jordan <norman.jordan@improving.com>

Author: normanj-bitquill

.github/workflows/test-and-build-workflow.yml

@@ -33,10 +33,7 @@ jobs:
         run: echo "SBT_OPTS=-Xmx2G" >> $GITHUB_ENV
 
       - name: Integ Test
-        run: sbt integtest/integration
-
-      - name: End-to-End Test
-        run: sbt e2etest/test
+        run: sbt integtest/integration e2etest/test
 
       - name: Upload test report
         if: always() # Ensures the artifact is saved even if tests fail