Regression suite cleanups