Merge "Moving backup test under non admin directory"