Some JUnit tests changed