Rearrange order of tests
Refactor 'delete-tag-by-name to use utilities