Force test coverage for all test runs (may refactor more later)
Merge branch 'refactor/fix-test-structure'