modified most of testcases