Did modifications on test suite