Complete test grammar; correct name modificator and + parser.