Get xml unmarshalling to work and add a test