Attempt 2 to support code coverage