simplify travis.yml
fix tests