implemented the rest of the JUnit tests