refactor the regression tests