Improved test coverage of basic fields
Minor code and message tidy ups, fixed bug with string formatting of datetimes