Updated JUnit to 4.11 and removed JSR331 dependency (now in Concrete)