Merge "Fix Ravenwood tests" into main