Move more tests to Mocha