Fixed tags to match optimizzation tests