JUnit additions and powermock pom fixes