Hookup reset flow WiP
More fixes
Working tests