Update tests to reflect do-undo changes