Fix tests for Plone 4.1.x - 4.2.x