Fixed test suite failures!