Changes to support coveralls