Adding debug output of query/result translator output along with name of
file.
Updated expected output based on changes from primitive types to wrapper
types within openmrs domain objects.