Changes for surefire plugin