Update for some JUnit tests