Added timeouts to unit tests