Tomgross cleanup

Finish porting to plone.app.testing and some minor cleanups