Minor fixes to regression tests for recent changes