Improvements related to backup test.
Improvements related to backup test.