Merge "fix backup unit tests"