[TRUNK-4033] added some other testcases and made some changes