Test suite fixed