Merge "Re-add parser tests to the ParserTests group"