Added: query mapper test