More restructuring of regression tests.