Remove duplicate tags from YML and fix related tests