Refactor our test files and remove mocha