fixes to regression tests