update test and package.json
resolve merge