Update JUnit test and config