fix two tests for plone5