rabbitmq module and test fixes/simplifications