Fixing couple of test case failures.