Did some test reorganization. Added a couple of tests. Updated references for mocha and chai