Fixed one bug with CDATA and found another + added attr/content tests