Readability improvements to FieldDefinitionTest

Change-Id: Id8eac754d98adcc5a4bc6a9cf3d76187bf329d74