Updated QueryMessagesTest to pass (but need a apnic one)