Reorganize mocha test, this will help when the tests are extended in the future.