Merge "Handle backup not found in test_create_backup"