Fix up backup/restore tests for ES changes