Completed xml dogma class and tests