More TestSuite Changes