Hookup reset flow (bug 1003882) 

~~TODO: Add the rest of the tests + clean-up.~~
Commented out code here.