Increase wait time. TODO make this more configurable for a multithreaded env.