Update travis.yml and tests