Moved mocha requirement to test helper
Unstub some stubbed methods to fix tests
Update changelog