Fix JUnit Tests