Added and fix test in DataParserTest