Testing Specific Fields

Pulled fields out into a map in the test and then asserting on the
contents of the various fields.