modified certain tests of test suite