Update unit tests & fix CDATA

Related to #2