Fixes for ambiguity

Fixed ambiguity introduced in SpeakerGateway during last commit

Broke out an identified some test code I'm using temporarily in place of
logic which should normally return a blank query