Fixing intercepting with cancelled response. Adding some tests