Fixing deserialization and adding unit test

There seems to be a bug in the deserialization that didn't manifest itself
with the existing unit test.  I added another unit test that
showed the problem and fixed the code in the same patch.