JUnit additions and powermock pom fixes

No match.