Revert "Revert "Trying to make test less flaky [#75286170]""

This reverts commit febc3758d217aa1b7389136e628b91a483f1e774.
Reverting to the old, inefficient style of testing that is more stable for now [#75286170]

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>