Update Tests
Tweak cancel process