Merge "Add cpu-set properties to serializer test"