suite_test: Update tests to check new feature fixes

Now that combination and matching of lists works properly, update the
suite test to check a more complex scenario.

Change-Id: Ib0b82dc0c2a7f27cd6b2ffc32eed5f1287692ddc
3 files changed