FieldGenerator tests + correction