Rebase test suite to be more modular