Fix tests to reflect that we've moved to amqp