Added multi-valued key support for unit testing comparisons