Merge "Minor cleanup in backup test cases"