Tweak reactivation workflow and tests