SCRATCH support for test_cases step + cleanup