More fixes to Travis CI and tests.