Reintroduced the queue/topic fetching timeout. Removed obsolete test.