Fix another bug in UT
Fix last failing of undo-tests