refactored some of the QueMaster tests