Additional issuer tests, and better conditionals for when to extract an issuer string from a token name