Revert "Fix coverage scope"

This reverts commit 17bfcbd0998bee92123f86eccdc71c943bd7f6bf.
Revert "Fix coverage scope"

This reverts commit 7fa9486fdc0176d51e8038c37d4ed0e3a2e18292.
Fix coverage scope