Fix the remaining specs to work with the new TestSuite format