cleanup code leftover from plone.app.testing
add missing dependencies