Updated Unit Test Cases and Build XML