Using correct event name to trigger a location query
Adding tests