Merge "Parser test file editor"