diff --git a/.github/workflows/barista-api.yml b/.github/workflows/barista-api.yml
index 1ca1a7a..ec582ab 100644
--- a/.github/workflows/barista-api.yml
+++ b/.github/workflows/barista-api.yml
@@ -53,14 +53,13 @@ jobs:
 
     - name: Test
       id: test
-      # Note that the space after the last double dash (--) is intentional
-      run: >
-        dotnet test ../**.Tests/**.csproj
-        --logger console --logger trx --logger html
-        --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
-        --results-directory ${{github.workspace}}/TestResults --blame
-        -- 
-        RunConfiguration.CollectSourceInformation=true
+      run: |
+        echo "## Test results" >> $GITHUB_STEP_SUMMARY
+        dotnet test ../**.Tests/**.csproj \
+        --results-directory ${{github.workspace}}/TestResults --blame \
+        --logger console --logger trx --logger html \
+        --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" \
+        -- RunConfiguration.CollectSourceInformation=true
     
     - name: Upload Test Results
       if: (success() || steps.test.conclusion == 'failure')
diff --git a/.github/workflows/cashier-api.yml b/.github/workflows/cashier-api.yml
index bb7a9da..c337557 100644
--- a/.github/workflows/cashier-api.yml
+++ b/.github/workflows/cashier-api.yml
@@ -57,17 +57,17 @@ jobs:
     - name: Build
       run: dotnet build -c Release --no-restore /p:CopyLocalLockFileAssemblies=true
 
+    - name: Test
+      run: dotnet test ../../../NCafe.sln --results-directory ./testresults --logger "trx;LogFileName=test_results.xml" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=./testresults/coverage/
     - name: Test
       id: test
-      # Note that the space after the last double dash (--) is intentional
       run: >
         dotnet test ../../../NCafe.sln
         --logger console --logger trx --logger html
         --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
         --results-directory ${{github.workspace}}/TestResults --blame
-        '/p:CollectCoverage=true;CoverletOutputFormat="json,lcov,cobertura";MergeWith=${{github.workspace}}/TestResults/coverage.json;CoverletOutput=${{github.workspace}}/TestResults/coverage' \
-        -- 
-        RunConfiguration.CollectSourceInformation=true
+        '/p:CollectCoverage=true;CoverletOutputFormat="json,lcov,cobertura";MergeWith=${{github.workspace}}/TestResults/coverage.json;CoverletOutput=${{github.workspace}}/TestResults/coverage'
+        -- RunConfiguration.CollectSourceInformation=true
     
     - name: Upload Test Results
       if: (success() || steps.test.conclusion == 'failure')