Merge "Fix some tests that are failing with wallpaper" into main