Slight tweaks to serialization test