Refactoring to prepare for multi-test-suite support