3640 Fix tag wrangling test