Merge "Revert "Move settings backup tests to own class""