WIP bundle mode test fix. This is blocked by bundle mode being fixed.

[AMZN-stankowi]

Posting as a draft until the dependencies are fixed

Signed-off-by: AMZN-stankowi [email protected]

What does this PR do?

Please describe your PR. For a bug fix, what was the old behavior, what is the new behavior?

Please add links to any issues, RFCs or other items that are relevant to this PR.

How was this PR tested?

Please describe any testing performed.