Bug 18308: fix failing tests