Convert JUnit to TestNG and add incremental features