Updated package.json and test suite