Remaining Unit test cases