Fix package.json, fix tests.