Fix modes on mocha stuff
Fix mocha review comments and failure to append complete