Avoid re-tagging user objects if a tag is already available.
Minor cleanup.
Corrected expected test outputs.