redo all the tests using mocha and clean up a bit
Merge pull request #27 from SIMS-Topaz/aja/redo_tests_and_clean

redo all the tests using mocha and clean up a bit