Rearrange tests for plone.app.testing
fix extras_require