Take out @token testing functionality