Refactor NaiveParserTest