Serializer Unit Test improvements