fix deep_merge with tests

HashWithIndifferentAccess.merge with block arg is apparently broken in some rails versions,
and BL5 uses a HWI for it's solr_params in solr_search_params_logic. Resulting in
crazy confusing bug. We avoid merge-with-block, and do it ourselves instead.