fixed tests, subsequent changes from renaming map_query