some updates to JUnit tests