on tests: dont always touch firm on validate
Merge pull request #12364 from arthurnn/test_fix_validate

Fix query counters when testing with IdentityMap on 3.2