Added Mocha and Istanbul to mix