Add explicit timeouts to tests