Fixing xml generator tests