Refactor in infra tag tests
Another modifications
Merge pull request #1241 from mfalesni/refactor-tag

Refactor in infra tag tests