Renames preparatory to parser tests refactor