Improved both production and test code for the " moduleInvokeQueueItemInfoExtractor"