Recover confirm and flow listeners
Add a test for confirm mode and listener recovery