Switched over to mocha for testing... finally!