[SUREFIRE-1095] NPE in JUnit 4.x RunListener + Refactoring