Trying to fix runtime errors in TestSuite