Merge pull request #19 from johnheroy/master

Change test suite to mocha and rename test folder