New version with CDATA wrapping by default

Added appropriate tests