For #1857: Refactor, test field value