Rename Tag to Token, rework some tests, move Token creation in Token constructor