Fixed RabbitMQ tests, tidied comments