Allow specifying a different queue name for the upstream, remove use of a fake exchange, start to write tests, remember to sepcify drain.