Updated xml format for tests