AMQP initial testing fixes