some changes; new test case added