test fixes due to new xml