Split patch cleanup test into suite level and test level.

Other minor cleanup items, as well as changing cleanup to
be more robust to suite setup not getting callled.