Add more unit tests (with JUnit 4).