Fix token tagging support

Also add tests for preventing regressions.

Change-Id: I829a759628d58242752fc2611802315d46934459
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
7 files changed