Undo structure and test