Added more tests and edited package.json