Suite refactoring