Fixed broken package.json file
Added some basic tests
Fixed a few unit test faliures
Merge branch 'master' into close