moved from $self to $parser

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