Add istanbul for coverage and improve some test coverage