Change restore test to deal with multiple files