Refactoring the regression tests for more independence

Refactoring the regression tests for more independence

Edit