Start work on integrating mocha tests