fix handling of COVERAGE option
merge changes from haarg