Serialization: Further testing and cleaing up