Move more tests over to mocha