Surefire version updated
Patching tests refactored, to better manage state before and after test