Merge "Inherit from FailureERR instead of TestFailureERR"