more refactoring in FailureDriver and client/tests