Merge "Move settings backup tests to own class"