New test xml + modifications