Refactor to adhere to surefire and failsafe conventions