Simplify travis config.
Fix test.