Fixed functional tests.  Removed mocha, kept mochatest.