(#1982) - test changes promise resolved when changes cancelled
(#1982) - fix changes promise not being resolved when canceled