Added new test cases and modified exiting test cases.