Minor Update to JUnit tests