changed XML grammar to testable format