Backup and Restore -- end-to-end test fixes.