Regression test cleanup