Fix quality flaw on Surefire
Fix quality flaws