Fixing mocha tests, moving to /tests directory