Special-casing deserializing non-atomic maps.
Previous test could fail if passed in equal arguments.  Fixed.