Fixed test failures on travis