New: add test
Fix: typo
Merge branch 'mocha'