added/updated timeouts to help resolve CI failures