Fix some tests that fail in Plone 5.