QA: Fix collapsing tests to reflect changes upstream

Change-Id: Ib841fb836daf8f50df4061ea35eb507915f87501
Merge "QA: Fix collapsing tests to reflect changes upstream"