Test suite changes