Elan's XML improvement: add "options" to local testcode as well.