Revisions to test code to support new fields.