cancelEdit moved to beforeLeave + use new bug numbers
some test changes