Added new unit test cases