Reformatted code.
Added new version of JUnit.