merge
fix expected path
fix 'hash' typo and update path for testShouldResolveWithCustomFiltersPopulatingCacheFirst