Simplified clean-up in all test scripts