TestNG refactoring