Revert to JUnit 4.7