get mocha tests passing
Merge remote-tracking branch 'origin/fix-mocha-tests' into union-types