Better diagnostics and control of cleanup in test/27*.