cleanup
"reset to theirs" — additional test assertions