re-added some tests that I think were clobbered in a previous merge
re-added some tests that I think were clobbered in a previous merge

domruf/mockup,plone/mockup,domruf/mockup,plone/mockup,domruf/mockup,domruf/mockup,termitnjak/mockup,termitnjak/mockup,derFreitag/mockup,derFreitag/mockup,termitnjak/mockup,plone/mockup,derFreitag/mockup,termitnjak/mockup,derFreitag/mockup