Added additional JUnit tests