Tests fails because of ISPN-6056. When it de-serializes a map, it uses the number of elements to build the map with the expected size. This changes the order in the hash table making the test fail.

Sort the elements in the test before checking it.

Also, use the read/writeObject methods instead of using the MarshallUtil.marshallMap.