Coveralls support
More simplification