Failed and passed test for restore delivery

Refactored restore tests to make tarred-deliver test easier to write

Passed and failed deliver tarred restore test