Minor fixes to regression tests.