Improve FieldDefinitionTest

Change-Id: I80d357027e3dfeae0620e1f1d0fb56be80607218
Merge "Improve FieldDefinitionTest"