Renamed *Parser to *Resolver
:put_litter_in_its_place:
Modified few tests