Changes in serialization, tests