Updated XML node and node attribute

Unit tests.