Fix some Zope2 set up order, match tearDown and also makes more sense.