Upgrade to JUnit 4.11