Fix test coverage reporting after test reorganization.