Merge "Revert "Generalize test-tag usage""