Merge "Fix tests for new overlayfs" into main