Bug 912022 - Test updates to reflect newly generated Match query DSL