Add more test timeouts to tests that wait