Updated tests
Updated package.json
Fixed .travis.yml