Rebase test suite to be more modular

This makes the regression test suite more modular which will hopefully make adding more test fixtures more inviting