Fix check
Updated packages.json
Updated test
Merge branch 'master' into retry