added timeouts to a few tests