diff --git a/.github/composite-actions/setup/action.yml b/.github/composite-actions/setup/action.yml
index c2f71bb5f..a2cc33f83 100644
--- a/.github/composite-actions/setup/action.yml
+++ b/.github/composite-actions/setup/action.yml
@@ -14,3 +14,9 @@ runs:
     - name: Install dependencies
       shell: bash
       run: yarn
+
+    - name: Setup lcov
+      shell: bash
+      run: |
+        sudo apt update
+        sudo apt install -y lcov
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e44306299..137e4f915 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,11 +38,10 @@ jobs:
         uses: onbjerg/foundry-toolchain@v1
         with:
           version: nightly
-      - name: Run coverage
+      - name: Run coverage and tests
         run: |
           forge coverage --report lcov
-      - name: Run tests
-        run: |
+          lcov --remove lcov.info -o lcov.info 'src/test/**'
           forge test
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
diff --git a/.gitignore b/.gitignore
index ee5663bd4..9c98d108a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ yarn.lock
 # Forge
 #/lib
 /out
+lcov.info
 
 #Build
 .swc/
diff --git a/.solhint.json b/.solhint.json
index 6c004c7aa..aa45d9874 100644
--- a/.solhint.json
+++ b/.solhint.json
@@ -16,6 +16,9 @@
     "var-name-mixedcase": "error",
     "func-visibility": ["error", { "ignoreConstructors": true }],
     "not-rely-on-time": "off",
+    "no-empty-blocks": "off",
+    "contract-name-camelcase": "off",
+    "no-inline-assembly": "off",
     "prettier/prettier": [
       "error",
       {