Fixed issue with tests using the development MQ. Also played around with the MQ class
Followup on YGG-33