Updated tests, and added a package.json