using istanbul for coverage
Merge branch 'better-test'