Updated Unit test cases