fix unexpected fields bug, uncomment tag test