Payload recovery test and fixes