Fixed test suite failures