Changed from TestNG to JUnit