Switch back to name-only tag rewriting
Remove duplicate test utility