Converting more tests to mocha
Merge pull request #396 from ilyavolodin/mocha

Converting more tests to mocha (refs #397)