Merge "Updated the testcases"