Fix up OnFail tests