Add missing tests & fix tagging work that was missed.