fix tests to match changes in solr index
refactor - simplify heatmapData object creation