Add JUnit, make compatible with Java 5