Test suite refactoring