Reverted Minor changes in suite.py and util.py