Reinstated the commented-out tests for the broker with wildcards, made them pass with a slight code change