test: multi-tenant flake (#14447)

30% of failures on main were from this suite. Attempting to fix flake.

NOTE: Some lint fixes were mixed in. This PR just adds 2 `await wait`
commands.

Author: denolfe