Use more specific xpath in specs
Extract parts of serializer to methods

Trying to avoid one large method for serialization.