TestSuite improvements