added all tokens
tests