Attempt to fix test case failures.