Merge "Fix test for headroom result." into main