Regression test clean up