Updated Unit Test Cases