[Bug 867221]
Fix the tests.