Updated tests and travis.yml