added translator tests and make query fields optional