Fixed most of the parser tests broken by filerepo merge