Refactored TestSuite and added more data into suite