Remove use of .Wait() from tests