Add updated tests utilizing mocha