Added Surefire test support