Fixed the undo, now time to fix the tests