Further fix for test.