Fix tests for 2.5.x

Also fixes the recovery tests for pre 2.5