Fix functional restore tests