updating tests to use testSuite and testSet