Fix test to reflect the fact that we can move a tag (with a warning) when we attempt to redeclare a directory
Fix test to allow for _userdata_