Added JUnit 4 and cleaned up pom.xml