Updated mocha import and fixed tests to match the new expected string
Merge remote-tracking branch 'origin/master'