Issue #2974657 by leolando.tan, spitzialist, borisson_, neclimdul, alexpott: Improve FilterIdTest provider keys (cherry picked from commit 5d8c1f49)