Removed TestSuite files and added to TestRunner