Added missing parentheses, fixed Token tests