All the mocha

Last part of #82