Merge "Rename Parser_DiffTest class to ParserDiffTest"