Improve FieldDefinitionTest