Confirmation tweaks - Clearing confirmation token

Fixing broken tests for #2545. PR for Issue #2544