Updated coverage collection to accurately combine
unit and acceptance test coverage information.