Fixed the unit tests to reflect the newly added support for multi-valued fields.