Updated some of the JUnit tests