diff --git a/.github/workflows/ci-unitest-build.yml b/.github/workflows/ci-unitest-build.yml
index 0f49d52..63feb7d 100644
--- a/.github/workflows/ci-unitest-build.yml
+++ b/.github/workflows/ci-unitest-build.yml
@@ -32,12 +32,12 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew :flagship:assembleDebug
       - name: Unit tests
-        run: bash ./gradlew flagship:testDebugUnitTestCoverage -i --stacktrace
+        run: bash ./gradlew flagship:testJacocoUnitTestCoverage -i --stacktrace
       - name: Generate report
-        run: bash ./gradlew flagship:createDebugUnitTestCoverageReport
+        run: bash ./gradlew flagship:createJacocoUnitTestCoverageReport
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v2
         with:
-          files: flagship/build/reports/coverage/test/debug/index.xml
+          files: flagship/build/reports/coverage/test/jacoco/report.xml
       - name: Build
         run: bash ./gradlew flagship:clean flagship:assembleRelease
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e907284..d36b53b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,13 +25,13 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew :flagship:assembleDebug
       - name: Unit tests
-        run: bash ./gradlew flagship:testDebugUnitTestCoverage -i --stacktrace
+        run: bash ./gradlew flagship:testJacocoUnitTestCoverage -i --stacktrace
       - name: Generate report
-        run: bash ./gradlew flagship:createDebugUnitTestCoverageReport
+        run: bash ./gradlew flagship:createJacocoUnitTestCoverageReport
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v2
         with:
-          files: flagship/build/reports/coverage/test/debug/index.xml
+          files: flagship/build/reports/coverage/test/jacoco/report.xml
       - name: Build and Publish
         env:
           SONATYPE_SIGNING_KEY: ${{ secrets.SONATYPE_SIGNING_KEY }}
diff --git a/flagship/jacoco.gradle b/flagship/jacoco.gradle
index fc2fdfc..c6b3596 100644
--- a/flagship/jacoco.gradle
+++ b/flagship/jacoco.gradle
@@ -18,6 +18,7 @@ project.afterEvaluate {
             description = "Generate Jacoco coverage reports on the ${variantName.capitalize()} build."
 
             reports {
+                xml.required = true
                 html.required = true
                 html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
             }
diff --git a/flagship/src/test/java/com/abtasty/flagship/FlagshipTestsHits.kt b/flagship/src/test/java/com/abtasty/flagship/FlagshipTestsHits.kt
index 403ef6a..d543ac9 100644
--- a/flagship/src/test/java/com/abtasty/flagship/FlagshipTestsHits.kt
+++ b/flagship/src/test/java/com/abtasty/flagship/FlagshipTestsHits.kt
@@ -1341,8 +1341,8 @@ class FlagshipTestsHits : AFlagshipTest() {
             ).await() //TBS 1 Account Settings
 
             delay(300)
-            val visitor =
-                Flagship.newVisitor("visitor_1", true).context(hashMapOf("isVIPUser" to true)).build() //  1 TBS Consent
+
+            val visitor = Flagship.newVisitor("visitor_1", true).context(hashMapOf("isVIPUser" to true)).build() //  1 TBS Consent
 
             delay(300)
 
@@ -1600,16 +1600,11 @@ class FlagshipTestsHits : AFlagshipTest() {
             FlagshipLogManager.exception(FlagshipConstants.Exceptions.Companion.FlagshipException(e, visitor.delegate))
         }
 
-
         runBlocking {
             delay(200)
         }
 
-
-        Assert.assertEquals(
-            4,
-            FlagshipTestsHelper.interceptor().calls[TROUBLESHOOTING_URL]?.size
-        ) // 1 Account Settings, 1 Fetch, 1 Consent, 1 Error
+        Assert.assertEquals(4, FlagshipTestsHelper.interceptor().calls[TROUBLESHOOTING_URL]?.size) // 1 Account Settings, 1 Fetch, 1 Consent, 1 Error
 
         FlagshipTestsHelper.interceptor().calls[TROUBLESHOOTING_URL]!![3].let {
             val jsonHit = HttpCompat.requestJson(it.first)