fixes and changes:

fixes on basic & remote links cancel
added missing test for that scenario