Reenable and fix recovery tests