fixed tests
npm package update
resolved master merge conflicts