[PATCH 14/14] smoke-tests: Changing the XML format