Add tests to impove coverage in FieldDefinition

Change-Id: I295c8745ac23951e1169f202fe6994bd4aac5e3b