Modified the unit test cases