Fix JUnit issues