Convert one more unit test over to improved waiting scheme to avoid build failures.
Convert one more unit test over to improved waiting scheme to avoid build failures.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm