Fixed conflict between JUnit and TestNG