Updated unit tests to include new fields.