Merge "Fixing a typo which caused some tests to not generate xml." into klp-dev