- Fix test failures in Travis.