Used Wait+Expect instead of Eventually

[#71337862]

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>