Fix Tag Test for longer tags Upstream-commit: 0d5daa4a8f12a451dfceba03161be68e1ece57e3 Component: engine