Fixed test suite