QA: Fix collapsing features tests

Change-Id: Iee9979278c852e0f3f406ff5b816559833a42d41
Merge "QA: Fix collapsing features tests" into frontend-rewrite