Updated tests and package.json