Switch to JUnit instead of TestNG