Fixing issues in test case.