partially fix regression tests