Adding mocha module and doing a bit of cleanup.