Added tests and modified package.json