DEV: Refactor regression tests