update token default code to avoid collisions
improve parser tests