Updated some JUnit tests, all are now passing