Fix for broken backup tests