Updated TestSuite