Added additional tests and further improvements to field defs.