Bug 14368: [Follow-up] Fix tests