Reenable and fix recovery tests in master