moved from $self to $parser

also added generated tests for the above, and moved back to member
tokens