Simplify travis tests
Fixed tests