Final changes before finishing, all.mocha test case