Fixing broken tests in Travis.