MapUtils and tests