From a6fe85c2e883bda2be9951fa1252fd04706f7b6a Mon Sep 17 00:00:00 2001
From: Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de>
Date: Thu, 18 Apr 2013 22:47:56 +0200
Subject: New XPath datamodel tests

---
 apps/samples/vrml/annotations.js         | 72 +++++++++++++++++++++++
 apps/samples/vrml/viewer.html            | 17 ++++--
 apps/samples/vrml/viewer.js              | 57 ++++++++++---------
 test/CMakeLists.txt                      |  5 +-
 test/samples/w3c/convert-tests.pl        | 37 ------------
 test/samples/w3c/convert-tests.sh        |  7 +++
 test/samples/w3c/ecma/test193.scxml      | 19 +++++++
 test/samples/w3c/ecma/test344.scxml      |  5 +-
 test/samples/w3c/ecma/test488.scxml      |  2 +-
 test/samples/w3c/ecma/test509.scxml      | 17 ++++++
 test/samples/w3c/ecma/test510.scxml      | 24 ++++++++
 test/samples/w3c/ecma/test518.scxml      | 20 +++++++
 test/samples/w3c/ecma/test519.scxml      | 19 +++++++
 test/samples/w3c/ecma/test520.scxml      | 19 +++++++
 test/samples/w3c/ecma/test522.scxml      | 22 +++++++
 test/samples/w3c/ecma/test531.scxml      | 20 +++++++
 test/samples/w3c/ecma/test532.scxml      | 20 +++++++
 test/samples/w3c/ecma/test534.scxml      | 18 ++++++
 test/samples/w3c/ecma/test543.scxml      | 18 ++++++
 test/samples/w3c/ecma/test567.scxml      | 30 ++++++++++
 test/samples/w3c/ecma/test568.scxml      |  2 +-
 test/samples/w3c/txml/test193.txml       | 22 +++++++
 test/samples/w3c/txml/test344.txml       |  5 +-
 test/samples/w3c/txml/test488.txml       |  2 +-
 test/samples/w3c/txml/test509.txml       | 21 +++++++
 test/samples/w3c/txml/test510.txml       | 28 +++++++++
 test/samples/w3c/txml/test518.txml       | 25 ++++++++
 test/samples/w3c/txml/test519.txml       | 21 +++++++
 test/samples/w3c/txml/test520.txml       | 21 +++++++
 test/samples/w3c/txml/test522.txml       | 27 +++++++++
 test/samples/w3c/txml/test531.txml       | 22 +++++++
 test/samples/w3c/txml/test532.txml       | 22 +++++++
 test/samples/w3c/txml/test534.txml       | 20 +++++++
 test/samples/w3c/txml/test543.txml       | 22 +++++++
 test/samples/w3c/txml/test567.txml       | 32 +++++++++++
 test/samples/w3c/txml/test568.txml       |  2 +-
 test/samples/w3c/xpath/test144.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test147.scxml     | 30 ++++++++++
 test/samples/w3c/xpath/test148.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test149.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test150.scxml     | 41 +++++++++++++
 test/samples/w3c/xpath/test151.scxml     | 41 +++++++++++++
 test/samples/w3c/xpath/test152.scxml     | 48 ++++++++++++++++
 test/samples/w3c/xpath/test153.scxml     | 35 ++++++++++++
 test/samples/w3c/xpath/test155.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test156.scxml     | 28 +++++++++
 test/samples/w3c/xpath/test158.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test159.scxml     | 20 +++++++
 test/samples/w3c/xpath/test172.scxml     | 20 +++++++
 test/samples/w3c/xpath/test173.scxml     | 21 +++++++
 test/samples/w3c/xpath/test174.scxml     | 21 +++++++
 test/samples/w3c/xpath/test175.scxml     | 27 +++++++++
 test/samples/w3c/xpath/test176.scxml     | 30 ++++++++++
 test/samples/w3c/xpath/test178.scxml     | 27 +++++++++
 test/samples/w3c/xpath/test179.scxml     | 18 ++++++
 test/samples/w3c/xpath/test183.scxml     | 21 +++++++
 test/samples/w3c/xpath/test185.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test186.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test187.scxml     | 33 +++++++++++
 test/samples/w3c/xpath/test189.scxml     | 22 +++++++
 test/samples/w3c/xpath/test190.scxml     | 35 ++++++++++++
 test/samples/w3c/xpath/test191.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test192.scxml     | 55 ++++++++++++++++++
 test/samples/w3c/xpath/test193.scxml     | 19 +++++++
 test/samples/w3c/xpath/test194.scxml     | 22 +++++++
 test/samples/w3c/xpath/test198.scxml     | 19 +++++++
 test/samples/w3c/xpath/test199.scxml     | 18 ++++++
 test/samples/w3c/xpath/test200.scxml     | 18 ++++++
 test/samples/w3c/xpath/test201.scxml     | 19 +++++++
 test/samples/w3c/xpath/test205.scxml     | 30 ++++++++++
 test/samples/w3c/xpath/test207.scxml     | 56 ++++++++++++++++++
 test/samples/w3c/xpath/test208.scxml     | 21 +++++++
 test/samples/w3c/xpath/test210.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test215.scxml     | 29 ++++++++++
 test/samples/w3c/xpath/test216.scxml     | 22 +++++++
 test/samples/w3c/xpath/test216sub1.scxml |  5 ++
 test/samples/w3c/xpath/test220.scxml     | 21 +++++++
 test/samples/w3c/xpath/test223.scxml     | 29 ++++++++++
 test/samples/w3c/xpath/test224.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test225.scxml     | 38 +++++++++++++
 test/samples/w3c/xpath/test226.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test226sub1.scxml | 16 ++++++
 test/samples/w3c/xpath/test228.scxml     | 33 +++++++++++
 test/samples/w3c/xpath/test229.scxml     | 42 ++++++++++++++
 test/samples/w3c/xpath/test230.scxml     | 62 ++++++++++++++++++++
 test/samples/w3c/xpath/test232.scxml     | 40 +++++++++++++
 test/samples/w3c/xpath/test233.scxml     | 35 ++++++++++++
 test/samples/w3c/xpath/test234.scxml     | 66 +++++++++++++++++++++
 test/samples/w3c/xpath/test235.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test236.scxml     | 39 +++++++++++++
 test/samples/w3c/xpath/test237.scxml     | 41 +++++++++++++
 test/samples/w3c/xpath/test239.scxml     | 32 +++++++++++
 test/samples/w3c/xpath/test239sub1.scxml |  5 ++
 test/samples/w3c/xpath/test240.scxml     | 67 ++++++++++++++++++++++
 test/samples/w3c/xpath/test241.scxml     | 98 ++++++++++++++++++++++++++++++++
 test/samples/w3c/xpath/test242.scxml     | 53 +++++++++++++++++
 test/samples/w3c/xpath/test242sub1.scxml |  5 ++
 test/samples/w3c/xpath/test243.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test244.scxml     | 39 +++++++++++++
 test/samples/w3c/xpath/test245.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test247.scxml     | 22 +++++++
 test/samples/w3c/xpath/test250.scxml     | 42 ++++++++++++++
 test/samples/w3c/xpath/test252.scxml     | 47 +++++++++++++++
 test/samples/w3c/xpath/test253.scxml     | 79 +++++++++++++++++++++++++
 test/samples/w3c/xpath/test276.scxml     | 17 ++++++
 test/samples/w3c/xpath/test276sub1.scxml | 21 +++++++
 test/samples/w3c/xpath/test277.scxml     | 28 +++++++++
 test/samples/w3c/xpath/test278.scxml     | 21 +++++++
 test/samples/w3c/xpath/test279.scxml     | 21 +++++++
 test/samples/w3c/xpath/test280.scxml     | 28 +++++++++
 test/samples/w3c/xpath/test286.scxml     | 18 ++++++
 test/samples/w3c/xpath/test287.scxml     | 19 +++++++
 test/samples/w3c/xpath/test294.scxml     | 46 +++++++++++++++
 test/samples/w3c/xpath/test298.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test301.scxml     | 13 +++++
 test/samples/w3c/xpath/test302.scxml     | 15 +++++
 test/samples/w3c/xpath/test303.scxml     | 20 +++++++
 test/samples/w3c/xpath/test304.scxml     | 13 +++++
 test/samples/w3c/xpath/test307.scxml     | 42 ++++++++++++++
 test/samples/w3c/xpath/test309.scxml     | 12 ++++
 test/samples/w3c/xpath/test310.scxml     | 18 ++++++
 test/samples/w3c/xpath/test311.scxml     | 16 ++++++
 test/samples/w3c/xpath/test312.scxml     | 20 +++++++
 test/samples/w3c/xpath/test313.scxml     | 21 +++++++
 test/samples/w3c/xpath/test314.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test318.scxml     | 27 +++++++++
 test/samples/w3c/xpath/test319.scxml     | 20 +++++++
 test/samples/w3c/xpath/test321.scxml     | 15 +++++
 test/samples/w3c/xpath/test322.scxml     | 33 +++++++++++
 test/samples/w3c/xpath/test323.scxml     | 15 +++++
 test/samples/w3c/xpath/test324.scxml     | 21 +++++++
 test/samples/w3c/xpath/test325.scxml     | 18 ++++++
 test/samples/w3c/xpath/test326.scxml     | 35 ++++++++++++
 test/samples/w3c/xpath/test329.scxml     | 53 +++++++++++++++++
 test/samples/w3c/xpath/test330.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test331.scxml     | 60 +++++++++++++++++++
 test/samples/w3c/xpath/test332.scxml     | 29 ++++++++++
 test/samples/w3c/xpath/test333.scxml     | 16 ++++++
 test/samples/w3c/xpath/test335.scxml     | 16 ++++++
 test/samples/w3c/xpath/test336.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test337.scxml     | 16 ++++++
 test/samples/w3c/xpath/test338.scxml     | 39 +++++++++++++
 test/samples/w3c/xpath/test339.scxml     | 16 ++++++
 test/samples/w3c/xpath/test342.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test343.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test344.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test346.scxml     | 53 +++++++++++++++++
 test/samples/w3c/xpath/test347.scxml     | 40 +++++++++++++
 test/samples/w3c/xpath/test348.scxml     | 18 ++++++
 test/samples/w3c/xpath/test349.scxml     | 29 ++++++++++
 test/samples/w3c/xpath/test350.scxml     | 22 +++++++
 test/samples/w3c/xpath/test351.scxml     | 48 ++++++++++++++++
 test/samples/w3c/xpath/test352.scxml     | 29 ++++++++++
 test/samples/w3c/xpath/test355.scxml     | 14 +++++
 test/samples/w3c/xpath/test364.scxml     | 73 ++++++++++++++++++++++++
 test/samples/w3c/xpath/test372.scxml     | 28 +++++++++
 test/samples/w3c/xpath/test375.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test376.scxml     | 22 +++++++
 test/samples/w3c/xpath/test377.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test378.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test387.scxml     | 97 +++++++++++++++++++++++++++++++
 test/samples/w3c/xpath/test388.scxml     | 76 +++++++++++++++++++++++++
 test/samples/w3c/xpath/test396.scxml     | 16 ++++++
 test/samples/w3c/xpath/test399.scxml     | 66 +++++++++++++++++++++
 test/samples/w3c/xpath/test401.scxml     | 21 +++++++
 test/samples/w3c/xpath/test402.scxml     | 40 +++++++++++++
 test/samples/w3c/xpath/test403a.scxml    | 43 ++++++++++++++
 test/samples/w3c/xpath/test403b.scxml    | 40 +++++++++++++
 test/samples/w3c/xpath/test403c.scxml    | 54 ++++++++++++++++++
 test/samples/w3c/xpath/test404.scxml     | 60 +++++++++++++++++++
 test/samples/w3c/xpath/test405.scxml     | 67 ++++++++++++++++++++++
 test/samples/w3c/xpath/test406.scxml     | 64 +++++++++++++++++++++
 test/samples/w3c/xpath/test407.scxml     | 20 +++++++
 test/samples/w3c/xpath/test409.scxml     | 32 +++++++++++
 test/samples/w3c/xpath/test411.scxml     | 32 +++++++++++
 test/samples/w3c/xpath/test412.scxml     | 52 +++++++++++++++++
 test/samples/w3c/xpath/test413.scxml     | 45 +++++++++++++++
 test/samples/w3c/xpath/test416.scxml     | 22 +++++++
 test/samples/w3c/xpath/test417.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test419.scxml     | 17 ++++++
 test/samples/w3c/xpath/test421.scxml     | 28 +++++++++
 test/samples/w3c/xpath/test422.scxml     | 75 ++++++++++++++++++++++++
 test/samples/w3c/xpath/test423.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test436.scxml     | 21 +++++++
 test/samples/w3c/xpath/test444.scxml     | 16 ++++++
 test/samples/w3c/xpath/test445.scxml     | 16 ++++++
 test/samples/w3c/xpath/test448.scxml     | 31 ++++++++++
 test/samples/w3c/xpath/test449.scxml     | 11 ++++
 test/samples/w3c/xpath/test451.scxml     | 18 ++++++
 test/samples/w3c/xpath/test452.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test453.scxml     | 19 +++++++
 test/samples/w3c/xpath/test456.scxml     | 19 +++++++
 test/samples/w3c/xpath/test457.scxml     | 59 +++++++++++++++++++
 test/samples/w3c/xpath/test460.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test463.scxml     | 17 ++++++
 test/samples/w3c/xpath/test464.scxml     | 16 ++++++
 test/samples/w3c/xpath/test465.scxml     | 22 +++++++
 test/samples/w3c/xpath/test466.scxml     | 14 +++++
 test/samples/w3c/xpath/test467.scxml     | 12 ++++
 test/samples/w3c/xpath/test468.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test469.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test470.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test473.scxml     | 37 ++++++++++++
 test/samples/w3c/xpath/test474.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test475.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test476.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test477.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test478.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test479.scxml     | 36 ++++++++++++
 test/samples/w3c/xpath/test480.scxml     | 32 +++++++++++
 test/samples/w3c/xpath/test481.scxml     | 37 ++++++++++++
 test/samples/w3c/xpath/test482.scxml     | 16 ++++++
 test/samples/w3c/xpath/test487.scxml     | 17 ++++++
 test/samples/w3c/xpath/test488.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test495.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test500.scxml     | 15 +++++
 test/samples/w3c/xpath/test501.scxml     | 19 +++++++
 test/samples/w3c/xpath/test503.scxml     | 37 ++++++++++++
 test/samples/w3c/xpath/test504.scxml     | 75 ++++++++++++++++++++++++
 test/samples/w3c/xpath/test505.scxml     | 47 +++++++++++++++
 test/samples/w3c/xpath/test506.scxml     | 53 +++++++++++++++++
 test/samples/w3c/xpath/test509.scxml     | 17 ++++++
 test/samples/w3c/xpath/test510.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test518.scxml     | 20 +++++++
 test/samples/w3c/xpath/test519.scxml     | 19 +++++++
 test/samples/w3c/xpath/test520.scxml     | 19 +++++++
 test/samples/w3c/xpath/test521.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test522.scxml     | 22 +++++++
 test/samples/w3c/xpath/test525.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test527.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test528.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test529.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test530.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test531.scxml     | 20 +++++++
 test/samples/w3c/xpath/test532.scxml     | 20 +++++++
 test/samples/w3c/xpath/test533.scxml     | 62 ++++++++++++++++++++
 test/samples/w3c/xpath/test534.scxml     | 18 ++++++
 test/samples/w3c/xpath/test537.scxml     | 17 ++++++
 test/samples/w3c/xpath/test539.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test540.scxml     | 21 +++++++
 test/samples/w3c/xpath/test542.scxml     | 34 +++++++++++
 test/samples/w3c/xpath/test543.scxml     | 18 ++++++
 test/samples/w3c/xpath/test544.scxml     | 17 ++++++
 test/samples/w3c/xpath/test546.scxml     | 17 ++++++
 test/samples/w3c/xpath/test547.scxml     | 33 +++++++++++
 test/samples/w3c/xpath/test550.scxml     | 20 +++++++
 test/samples/w3c/xpath/test551.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test552.scxml     | 18 ++++++
 test/samples/w3c/xpath/test553.scxml     | 23 ++++++++
 test/samples/w3c/xpath/test554.scxml     | 25 ++++++++
 test/samples/w3c/xpath/test555.scxml     | 27 +++++++++
 test/samples/w3c/xpath/test557.scxml     | 26 +++++++++
 test/samples/w3c/xpath/test558.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test560.scxml     | 19 +++++++
 test/samples/w3c/xpath/test561.scxml     | 24 ++++++++
 test/samples/w3c/xpath/test562.scxml     | 22 +++++++
 test/samples/w3c/xpath/test567.scxml     | 30 ++++++++++
 test/samples/w3c/xpath/test568.scxml     | 15 +++++
 test/samples/w3c/xpath/test569.scxml     | 15 +++++
 test/samples/w3c/xpath/test570.scxml     | 45 +++++++++++++++
 test/samples/w3c/xpath/test576.scxml     | 37 ++++++++++++
 test/samples/w3c/xpath/test578.scxml     | 19 +++++++
 262 files changed, 7424 insertions(+), 77 deletions(-)
 create mode 100644 apps/samples/vrml/annotations.js
 delete mode 100755 test/samples/w3c/convert-tests.pl
 create mode 100644 test/samples/w3c/ecma/test193.scxml
 create mode 100644 test/samples/w3c/ecma/test509.scxml
 create mode 100644 test/samples/w3c/ecma/test510.scxml
 create mode 100644 test/samples/w3c/ecma/test518.scxml
 create mode 100644 test/samples/w3c/ecma/test519.scxml
 create mode 100644 test/samples/w3c/ecma/test520.scxml
 create mode 100644 test/samples/w3c/ecma/test522.scxml
 create mode 100644 test/samples/w3c/ecma/test531.scxml
 create mode 100644 test/samples/w3c/ecma/test532.scxml
 create mode 100644 test/samples/w3c/ecma/test534.scxml
 create mode 100644 test/samples/w3c/ecma/test543.scxml
 create mode 100644 test/samples/w3c/ecma/test567.scxml
 create mode 100644 test/samples/w3c/txml/test193.txml
 create mode 100644 test/samples/w3c/txml/test509.txml
 create mode 100644 test/samples/w3c/txml/test510.txml
 create mode 100644 test/samples/w3c/txml/test518.txml
 create mode 100644 test/samples/w3c/txml/test519.txml
 create mode 100644 test/samples/w3c/txml/test520.txml
 create mode 100644 test/samples/w3c/txml/test522.txml
 create mode 100644 test/samples/w3c/txml/test531.txml
 create mode 100644 test/samples/w3c/txml/test532.txml
 create mode 100644 test/samples/w3c/txml/test534.txml
 create mode 100644 test/samples/w3c/txml/test543.txml
 create mode 100644 test/samples/w3c/txml/test567.txml
 create mode 100644 test/samples/w3c/xpath/test144.scxml
 create mode 100644 test/samples/w3c/xpath/test147.scxml
 create mode 100644 test/samples/w3c/xpath/test148.scxml
 create mode 100644 test/samples/w3c/xpath/test149.scxml
 create mode 100644 test/samples/w3c/xpath/test150.scxml
 create mode 100644 test/samples/w3c/xpath/test151.scxml
 create mode 100644 test/samples/w3c/xpath/test152.scxml
 create mode 100644 test/samples/w3c/xpath/test153.scxml
 create mode 100644 test/samples/w3c/xpath/test155.scxml
 create mode 100644 test/samples/w3c/xpath/test156.scxml
 create mode 100644 test/samples/w3c/xpath/test158.scxml
 create mode 100644 test/samples/w3c/xpath/test159.scxml
 create mode 100644 test/samples/w3c/xpath/test172.scxml
 create mode 100644 test/samples/w3c/xpath/test173.scxml
 create mode 100644 test/samples/w3c/xpath/test174.scxml
 create mode 100644 test/samples/w3c/xpath/test175.scxml
 create mode 100644 test/samples/w3c/xpath/test176.scxml
 create mode 100644 test/samples/w3c/xpath/test178.scxml
 create mode 100644 test/samples/w3c/xpath/test179.scxml
 create mode 100644 test/samples/w3c/xpath/test183.scxml
 create mode 100644 test/samples/w3c/xpath/test185.scxml
 create mode 100644 test/samples/w3c/xpath/test186.scxml
 create mode 100644 test/samples/w3c/xpath/test187.scxml
 create mode 100644 test/samples/w3c/xpath/test189.scxml
 create mode 100644 test/samples/w3c/xpath/test190.scxml
 create mode 100644 test/samples/w3c/xpath/test191.scxml
 create mode 100644 test/samples/w3c/xpath/test192.scxml
 create mode 100644 test/samples/w3c/xpath/test193.scxml
 create mode 100644 test/samples/w3c/xpath/test194.scxml
 create mode 100644 test/samples/w3c/xpath/test198.scxml
 create mode 100644 test/samples/w3c/xpath/test199.scxml
 create mode 100644 test/samples/w3c/xpath/test200.scxml
 create mode 100644 test/samples/w3c/xpath/test201.scxml
 create mode 100644 test/samples/w3c/xpath/test205.scxml
 create mode 100644 test/samples/w3c/xpath/test207.scxml
 create mode 100644 test/samples/w3c/xpath/test208.scxml
 create mode 100644 test/samples/w3c/xpath/test210.scxml
 create mode 100644 test/samples/w3c/xpath/test215.scxml
 create mode 100644 test/samples/w3c/xpath/test216.scxml
 create mode 100644 test/samples/w3c/xpath/test216sub1.scxml
 create mode 100644 test/samples/w3c/xpath/test220.scxml
 create mode 100644 test/samples/w3c/xpath/test223.scxml
 create mode 100644 test/samples/w3c/xpath/test224.scxml
 create mode 100644 test/samples/w3c/xpath/test225.scxml
 create mode 100644 test/samples/w3c/xpath/test226.scxml
 create mode 100644 test/samples/w3c/xpath/test226sub1.scxml
 create mode 100644 test/samples/w3c/xpath/test228.scxml
 create mode 100644 test/samples/w3c/xpath/test229.scxml
 create mode 100644 test/samples/w3c/xpath/test230.scxml
 create mode 100644 test/samples/w3c/xpath/test232.scxml
 create mode 100644 test/samples/w3c/xpath/test233.scxml
 create mode 100644 test/samples/w3c/xpath/test234.scxml
 create mode 100644 test/samples/w3c/xpath/test235.scxml
 create mode 100644 test/samples/w3c/xpath/test236.scxml
 create mode 100644 test/samples/w3c/xpath/test237.scxml
 create mode 100644 test/samples/w3c/xpath/test239.scxml
 create mode 100644 test/samples/w3c/xpath/test239sub1.scxml
 create mode 100644 test/samples/w3c/xpath/test240.scxml
 create mode 100644 test/samples/w3c/xpath/test241.scxml
 create mode 100644 test/samples/w3c/xpath/test242.scxml
 create mode 100644 test/samples/w3c/xpath/test242sub1.scxml
 create mode 100644 test/samples/w3c/xpath/test243.scxml
 create mode 100644 test/samples/w3c/xpath/test244.scxml
 create mode 100644 test/samples/w3c/xpath/test245.scxml
 create mode 100644 test/samples/w3c/xpath/test247.scxml
 create mode 100644 test/samples/w3c/xpath/test250.scxml
 create mode 100644 test/samples/w3c/xpath/test252.scxml
 create mode 100644 test/samples/w3c/xpath/test253.scxml
 create mode 100644 test/samples/w3c/xpath/test276.scxml
 create mode 100644 test/samples/w3c/xpath/test276sub1.scxml
 create mode 100644 test/samples/w3c/xpath/test277.scxml
 create mode 100644 test/samples/w3c/xpath/test278.scxml
 create mode 100644 test/samples/w3c/xpath/test279.scxml
 create mode 100644 test/samples/w3c/xpath/test280.scxml
 create mode 100644 test/samples/w3c/xpath/test286.scxml
 create mode 100644 test/samples/w3c/xpath/test287.scxml
 create mode 100644 test/samples/w3c/xpath/test294.scxml
 create mode 100644 test/samples/w3c/xpath/test298.scxml
 create mode 100644 test/samples/w3c/xpath/test301.scxml
 create mode 100644 test/samples/w3c/xpath/test302.scxml
 create mode 100644 test/samples/w3c/xpath/test303.scxml
 create mode 100644 test/samples/w3c/xpath/test304.scxml
 create mode 100644 test/samples/w3c/xpath/test307.scxml
 create mode 100644 test/samples/w3c/xpath/test309.scxml
 create mode 100644 test/samples/w3c/xpath/test310.scxml
 create mode 100644 test/samples/w3c/xpath/test311.scxml
 create mode 100644 test/samples/w3c/xpath/test312.scxml
 create mode 100644 test/samples/w3c/xpath/test313.scxml
 create mode 100644 test/samples/w3c/xpath/test314.scxml
 create mode 100644 test/samples/w3c/xpath/test318.scxml
 create mode 100644 test/samples/w3c/xpath/test319.scxml
 create mode 100644 test/samples/w3c/xpath/test321.scxml
 create mode 100644 test/samples/w3c/xpath/test322.scxml
 create mode 100644 test/samples/w3c/xpath/test323.scxml
 create mode 100644 test/samples/w3c/xpath/test324.scxml
 create mode 100644 test/samples/w3c/xpath/test325.scxml
 create mode 100644 test/samples/w3c/xpath/test326.scxml
 create mode 100644 test/samples/w3c/xpath/test329.scxml
 create mode 100644 test/samples/w3c/xpath/test330.scxml
 create mode 100644 test/samples/w3c/xpath/test331.scxml
 create mode 100644 test/samples/w3c/xpath/test332.scxml
 create mode 100644 test/samples/w3c/xpath/test333.scxml
 create mode 100644 test/samples/w3c/xpath/test335.scxml
 create mode 100644 test/samples/w3c/xpath/test336.scxml
 create mode 100644 test/samples/w3c/xpath/test337.scxml
 create mode 100644 test/samples/w3c/xpath/test338.scxml
 create mode 100644 test/samples/w3c/xpath/test339.scxml
 create mode 100644 test/samples/w3c/xpath/test342.scxml
 create mode 100644 test/samples/w3c/xpath/test343.scxml
 create mode 100644 test/samples/w3c/xpath/test344.scxml
 create mode 100644 test/samples/w3c/xpath/test346.scxml
 create mode 100644 test/samples/w3c/xpath/test347.scxml
 create mode 100644 test/samples/w3c/xpath/test348.scxml
 create mode 100644 test/samples/w3c/xpath/test349.scxml
 create mode 100644 test/samples/w3c/xpath/test350.scxml
 create mode 100644 test/samples/w3c/xpath/test351.scxml
 create mode 100644 test/samples/w3c/xpath/test352.scxml
 create mode 100644 test/samples/w3c/xpath/test355.scxml
 create mode 100644 test/samples/w3c/xpath/test364.scxml
 create mode 100644 test/samples/w3c/xpath/test372.scxml
 create mode 100644 test/samples/w3c/xpath/test375.scxml
 create mode 100644 test/samples/w3c/xpath/test376.scxml
 create mode 100644 test/samples/w3c/xpath/test377.scxml
 create mode 100644 test/samples/w3c/xpath/test378.scxml
 create mode 100644 test/samples/w3c/xpath/test387.scxml
 create mode 100644 test/samples/w3c/xpath/test388.scxml
 create mode 100644 test/samples/w3c/xpath/test396.scxml
 create mode 100644 test/samples/w3c/xpath/test399.scxml
 create mode 100644 test/samples/w3c/xpath/test401.scxml
 create mode 100644 test/samples/w3c/xpath/test402.scxml
 create mode 100644 test/samples/w3c/xpath/test403a.scxml
 create mode 100644 test/samples/w3c/xpath/test403b.scxml
 create mode 100644 test/samples/w3c/xpath/test403c.scxml
 create mode 100644 test/samples/w3c/xpath/test404.scxml
 create mode 100644 test/samples/w3c/xpath/test405.scxml
 create mode 100644 test/samples/w3c/xpath/test406.scxml
 create mode 100644 test/samples/w3c/xpath/test407.scxml
 create mode 100644 test/samples/w3c/xpath/test409.scxml
 create mode 100644 test/samples/w3c/xpath/test411.scxml
 create mode 100644 test/samples/w3c/xpath/test412.scxml
 create mode 100644 test/samples/w3c/xpath/test413.scxml
 create mode 100644 test/samples/w3c/xpath/test416.scxml
 create mode 100644 test/samples/w3c/xpath/test417.scxml
 create mode 100644 test/samples/w3c/xpath/test419.scxml
 create mode 100644 test/samples/w3c/xpath/test421.scxml
 create mode 100644 test/samples/w3c/xpath/test422.scxml
 create mode 100644 test/samples/w3c/xpath/test423.scxml
 create mode 100644 test/samples/w3c/xpath/test436.scxml
 create mode 100644 test/samples/w3c/xpath/test444.scxml
 create mode 100644 test/samples/w3c/xpath/test445.scxml
 create mode 100644 test/samples/w3c/xpath/test448.scxml
 create mode 100644 test/samples/w3c/xpath/test449.scxml
 create mode 100644 test/samples/w3c/xpath/test451.scxml
 create mode 100644 test/samples/w3c/xpath/test452.scxml
 create mode 100644 test/samples/w3c/xpath/test453.scxml
 create mode 100644 test/samples/w3c/xpath/test456.scxml
 create mode 100644 test/samples/w3c/xpath/test457.scxml
 create mode 100644 test/samples/w3c/xpath/test460.scxml
 create mode 100644 test/samples/w3c/xpath/test463.scxml
 create mode 100644 test/samples/w3c/xpath/test464.scxml
 create mode 100644 test/samples/w3c/xpath/test465.scxml
 create mode 100644 test/samples/w3c/xpath/test466.scxml
 create mode 100644 test/samples/w3c/xpath/test467.scxml
 create mode 100644 test/samples/w3c/xpath/test468.scxml
 create mode 100644 test/samples/w3c/xpath/test469.scxml
 create mode 100644 test/samples/w3c/xpath/test470.scxml
 create mode 100644 test/samples/w3c/xpath/test473.scxml
 create mode 100644 test/samples/w3c/xpath/test474.scxml
 create mode 100644 test/samples/w3c/xpath/test475.scxml
 create mode 100644 test/samples/w3c/xpath/test476.scxml
 create mode 100644 test/samples/w3c/xpath/test477.scxml
 create mode 100644 test/samples/w3c/xpath/test478.scxml
 create mode 100644 test/samples/w3c/xpath/test479.scxml
 create mode 100644 test/samples/w3c/xpath/test480.scxml
 create mode 100644 test/samples/w3c/xpath/test481.scxml
 create mode 100644 test/samples/w3c/xpath/test482.scxml
 create mode 100644 test/samples/w3c/xpath/test487.scxml
 create mode 100644 test/samples/w3c/xpath/test488.scxml
 create mode 100644 test/samples/w3c/xpath/test495.scxml
 create mode 100644 test/samples/w3c/xpath/test500.scxml
 create mode 100644 test/samples/w3c/xpath/test501.scxml
 create mode 100644 test/samples/w3c/xpath/test503.scxml
 create mode 100644 test/samples/w3c/xpath/test504.scxml
 create mode 100644 test/samples/w3c/xpath/test505.scxml
 create mode 100644 test/samples/w3c/xpath/test506.scxml
 create mode 100644 test/samples/w3c/xpath/test509.scxml
 create mode 100644 test/samples/w3c/xpath/test510.scxml
 create mode 100644 test/samples/w3c/xpath/test518.scxml
 create mode 100644 test/samples/w3c/xpath/test519.scxml
 create mode 100644 test/samples/w3c/xpath/test520.scxml
 create mode 100644 test/samples/w3c/xpath/test521.scxml
 create mode 100644 test/samples/w3c/xpath/test522.scxml
 create mode 100644 test/samples/w3c/xpath/test525.scxml
 create mode 100644 test/samples/w3c/xpath/test527.scxml
 create mode 100644 test/samples/w3c/xpath/test528.scxml
 create mode 100644 test/samples/w3c/xpath/test529.scxml
 create mode 100644 test/samples/w3c/xpath/test530.scxml
 create mode 100644 test/samples/w3c/xpath/test531.scxml
 create mode 100644 test/samples/w3c/xpath/test532.scxml
 create mode 100644 test/samples/w3c/xpath/test533.scxml
 create mode 100644 test/samples/w3c/xpath/test534.scxml
 create mode 100644 test/samples/w3c/xpath/test537.scxml
 create mode 100644 test/samples/w3c/xpath/test539.scxml
 create mode 100644 test/samples/w3c/xpath/test540.scxml
 create mode 100644 test/samples/w3c/xpath/test542.scxml
 create mode 100644 test/samples/w3c/xpath/test543.scxml
 create mode 100644 test/samples/w3c/xpath/test544.scxml
 create mode 100644 test/samples/w3c/xpath/test546.scxml
 create mode 100644 test/samples/w3c/xpath/test547.scxml
 create mode 100644 test/samples/w3c/xpath/test550.scxml
 create mode 100644 test/samples/w3c/xpath/test551.scxml
 create mode 100644 test/samples/w3c/xpath/test552.scxml
 create mode 100644 test/samples/w3c/xpath/test553.scxml
 create mode 100644 test/samples/w3c/xpath/test554.scxml
 create mode 100644 test/samples/w3c/xpath/test555.scxml
 create mode 100644 test/samples/w3c/xpath/test557.scxml
 create mode 100644 test/samples/w3c/xpath/test558.scxml
 create mode 100644 test/samples/w3c/xpath/test560.scxml
 create mode 100644 test/samples/w3c/xpath/test561.scxml
 create mode 100644 test/samples/w3c/xpath/test562.scxml
 create mode 100644 test/samples/w3c/xpath/test567.scxml
 create mode 100644 test/samples/w3c/xpath/test568.scxml
 create mode 100644 test/samples/w3c/xpath/test569.scxml
 create mode 100644 test/samples/w3c/xpath/test570.scxml
 create mode 100644 test/samples/w3c/xpath/test576.scxml
 create mode 100644 test/samples/w3c/xpath/test578.scxml

diff --git a/apps/samples/vrml/annotations.js b/apps/samples/vrml/annotations.js
new file mode 100644
index 0000000..f915285
--- /dev/null
+++ b/apps/samples/vrml/annotations.js
@@ -0,0 +1,72 @@
+function Annotations(element, params) {
+		
+	// private attributes
+	var self = this;
+	var dojo               = require("dojo");
+	var domConst           = dojo.require('dojo/dom-construct');
+	var xhr                = dojo.require("dojo/_base/xhr");
+
+  if (typeof(element) === 'string') {
+    element = dojo.byId(element);
+  }
+
+  // private instanceId
+  if (!Annotations.instances)
+  	Annotations.instances = 0;
+  var instanceId = Annotations.instances++;
+  
+  // public attributes
+  this.annotations = [];
+  this.vrmlViewer = params.viewer;
+
+  // establish our dom
+	element.appendChild(domConst.toDom('\
+    <div style="text-align: right"><div class="annotation" /></div><button type="button" class="annotate"></button></div>\
+	  <div class="messages"></div>\
+	'));
+  
+  this.annotationTextElem = dojo.query("div.annotation", element)[0];
+	this.annotateButtonElem = dojo.query("button.annotate", element)[0];
+	this.messagesElem = dojo.query("div.messages", element)[0];
+	
+	// privileged public methods
+	this.annotate = function(text) {
+    var pose = self.vrmlViewer.pose;
+    var imageURL = self.imageURL;
+    var annoLink = document.createElement("a");
+    annoLink.setAttribute("href", "#");
+    var annoText = document.createTextNode(text + "\n");
+    annoLink.appendChild(annoText);
+    annoLink.onclick = function() {
+      self.vrmlViewer.pose = pose;
+      self.vrmlViewer.imageURL = imageURL;
+      self.vrmlViewer.updateScene();
+    }
+	  this.messagesElem.appendChild(annoLink);
+	}
+
+	require(["dijit/form/TextBox"], function(TextBox) {
+  	self.annotationBox = new TextBox({
+      name: "Annotation",
+  		style: "width: 70%",
+  		onKeyDown: function(e) {
+        var code = e.keyCode || e.which;
+        if( code === 13 ) {
+          e.preventDefault();
+    		  self.annotate(this.get("value"));
+          return false; 
+        }
+  		},
+  	}, self.annotationTextElem);
+  });
+  
+  require(["dijit/form/Button"], function(Button) {
+  	self.resetButton = new Button({
+      label: "Annotate",
+  		onClick: function(){
+  		  self.annotate(self.annotationBox.get("value"));
+  		}
+  	}, self.annotateButtonElem);
+  });
+  
+}
diff --git a/apps/samples/vrml/viewer.html b/apps/samples/vrml/viewer.html
index ea1e7a4..977eeeb 100644
--- a/apps/samples/vrml/viewer.html
+++ b/apps/samples/vrml/viewer.html
@@ -33,16 +33,25 @@
 
 		<script src="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"></script>
     <script type="text/javascript" src="viewer.js"></script>
+    <script type="text/javascript" src="annotations.js"></script>
     
     <script type="text/javascript">
 			require(["dojo/domReady!", "dojo"], function(dom, dojo) {
 				var viewer = new VRMLViewer("scene1");
-			});		  
+				var annotations = new Annotations("annotations1", { 'viewer': viewer });
+			});
 		</script>
 	</head>
 	<body class="tundra">
-		<div style="width: 600px; height: 400px">
-			<div id="scene1"></div>
-		</div>
+		<table>
+			<tr><td>
+				<div style="width: 600px; height: 600px">
+					<div id="scene1"></div>
+				</div>
+			</td></tr>
+			<tr><td>
+				<div id="annotations1"></div>
+			</td></tr>
+		</table>
 	</body>
 </html>
diff --git a/apps/samples/vrml/viewer.js b/apps/samples/vrml/viewer.js
index 42edce1..c75aa70 100644
--- a/apps/samples/vrml/viewer.js
+++ b/apps/samples/vrml/viewer.js
@@ -34,16 +34,17 @@ function VRMLViewer(element, params) {
   var instanceId = VRMLViewer.instances++;
   
   // public attributes
-  this.pitch       = 0;
-	this.roll        = 0;
-	this.yaw         = 0;
-	this.zoom        = 1;
-	this.x           = 0;
-	this.y           = 0;
-	this.z           = 0;
-	this.width       = 640;
-	this.height      = 480;
-	this.autorotate  = false;
+  this.pose = {};
+  this.pose.pitch       = 0;
+	this.pose.roll        = 0;
+	this.pose.yaw         = 0;
+	this.pose.zoom        = 1;
+	this.pose.x           = 0;
+	this.pose.y           = 0;
+	this.pose.z           = 0;
+	this.pose.width       = 640;
+	this.pose.height      = 480;
+	this.pose.autorotate  = false;
 
   this.serverURL = "http://88.69.49.213:8080/vrml";
   this.imageURL;
@@ -65,16 +66,16 @@ function VRMLViewer(element, params) {
 	this.updateScene = function() {
 	  if (self.imageURL) {
   	  self.imgElem.src = self.imageURL + 
-  	    '?width=' + self.width + 
-  	    '&height=' + self.height +
-  	    '&pitch=' + self.pitch +
-  	    '&roll=' + self.roll +
-  	    '&yaw=' + self.yaw +
-  	    '&x=' + self.x +
-  	    '&y=' + self.y +
-  	    '&z=' + self.z +
-  	    '&zoom=' + self.zoom +
-  	    '&autorotate=' + (self.autorotate ? '1' : '0');
+  	    '?width=' + self.pose.width + 
+  	    '&height=' + self.pose.height +
+  	    '&pitch=' + self.pose.pitch +
+  	    '&roll=' + self.pose.roll +
+  	    '&yaw=' + self.pose.yaw +
+  	    '&x=' + self.pose.x +
+  	    '&y=' + self.pose.y +
+  	    '&z=' + self.pose.z +
+  	    '&zoom=' + self.pose.zoom +
+  	    '&autorotate=' + (self.pose.autorotate ? '1' : '0');
       }
 	}
 
@@ -113,7 +114,7 @@ function VRMLViewer(element, params) {
 			<tr>\
 				<td valign="top">\
 						<div style="position: relative; padding: 0px">\
-						  <img class="model" style="z-index: -1; min-width: ' + self.width + 'px; min-height: ' + self.height + 'px"></img>\
+						  <img class="model" style="z-index: -1; min-width: ' + self.pose.width + 'px; min-height: ' + self.pose.height + 'px"></img>\
   						<div style="position: absolute; left: 10px; top: 7%; height: 100%">\
   						  <div class="pitchSlide"></div>\
   					  </div>\
@@ -268,7 +269,7 @@ function VRMLViewer(element, params) {
       constraints: { places:0 },
       style: "width:60px",
       onChange: function(value){
-      	self.x = value;
+      	self.pose.x = value;
       	self.updateScene();
       }
     }, self.xSpinnerElem );
@@ -281,7 +282,7 @@ function VRMLViewer(element, params) {
       constraints: { places:0 },
       style: "width:60px",
       onChange: function(value){
-      	self.y = value;
+      	self.pose.y = value;
       	self.updateScene();
       }
     }, self.ySpinnerElem );
@@ -294,7 +295,7 @@ function VRMLViewer(element, params) {
       constraints: { places:0 },
       style: "width:60px",
       onChange: function(value){
-      	self.z = value;
+      	self.pose.z = value;
       	self.updateScene();
       }
     }, self.zSpinnerElem );
@@ -319,7 +320,7 @@ function VRMLViewer(element, params) {
   		intermediateChanges: false,
   		style: "height: 90%",
       onChange: function(value){
-      	self.zoom = Math.ceil(value * 1000) / 1000;
+      	self.pose.zoom = Math.ceil(value * 1000) / 1000;
       	self.updateScene();
       }
   	}, self.zoomSlideElem);
@@ -351,7 +352,7 @@ function VRMLViewer(element, params) {
   		intermediateChanges: false,
   		style: "height: 90%",
       onChange: function(value){
-      	self.pitch = Math.ceil(value * 100) / 100;
+      	self.pose.pitch = Math.ceil(value * 100) / 100;
       	self.updateScene();
       }
   	}, self.pitchSlideElem);
@@ -366,7 +367,7 @@ function VRMLViewer(element, params) {
   		intermediateChanges: false,
   		style: "width: 90%",
   		onChange: function(value){
-  			self.roll = Math.ceil(value * 100) / 100;
+  			self.pose.roll = Math.ceil(value * 100) / 100;
 				self.updateScene();
   		}
   	}, self.rollSlideElem);
@@ -381,7 +382,7 @@ function VRMLViewer(element, params) {
   		intermediateChanges: false,
   		style: "width: 90%",
   		onChange: function(value){
-  			self.yaw = Math.ceil(value * 100) / 100;
+  			self.pose.yaw = Math.ceil(value * 100) / 100;
 				self.updateScene();
   		}
   	}, self.yawSlideElem);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0bf8065..96797b8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -80,11 +80,12 @@ if (RUN_W3C_TESTS)
 	set_target_properties(test-w3c PROPERTIES FOLDER "Tests")
 
 	file(GLOB_RECURSE W3C_TESTS
-		samples/w3c/ecma/*.scxml
+		samples/w3c/*.scxml
 	)
 	
 	foreach( W3C_TEST ${W3C_TESTS} )
-		string(REGEX MATCH "[^//]+.scxml" TEST_NAME ${W3C_TEST})
+		string(REGEX MATCH "[^//]+/[^//]+.scxml" TEST_NAME ${W3C_TEST})
+		message("TEST_NAME: ${TEST_NAME}")
 		if (NOT TEST_NAME MATCHES ".*sub.*")
 			add_test(${TEST_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-w3c ${W3C_TEST})
 		endif()
diff --git a/test/samples/w3c/convert-tests.pl b/test/samples/w3c/convert-tests.pl
deleted file mode 100755
index 9c91e3c..0000000
--- a/test/samples/w3c/convert-tests.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/opt/local/bin/perl -w
-
-use strict;
-
-use XML::LibXSLT;
-use XML::LibXML;
-use Data::Dumper;
-
-my $xslt = XML::LibXSLT->new();
-my $xsl = shift || 'confEcma.xsl';
-
-opendir(my $testDir, "tests") or die($!);
-opendir(my $txmlDir, "txml") or die($!);
-while(readdir $txmlDir) {
-  next unless /txml$/;
-  my $baseName = $_;
-  my $txmlFile = 'txml/'.$_;
-  
-  my $source = XML::LibXML->load_xml(location => $txmlFile) or die($!);
-  my $style_doc = XML::LibXML->load_xml(location => $xsl, no_cdata=>1) or die($!);
-  
-  my $stylesheet = $xslt->parse_stylesheet($style_doc) or die($!);
-  my $results = $stylesheet->transform($source) or die($!);
-    
-  open(my $json, '>', "tests/".$baseName.".json") or die($!);
-  print $json <<EOF;
-{
-    "initialConfiguration" : ["pass"],
-    "events" : []
-}
-EOF
-  close($json);
-
-  open(my $scxml, '>', "tests/".$baseName.".scxml") or die($!);
-  print $scxml $stylesheet->output_as_bytes($results);
-  close($scxml);
-}
diff --git a/test/samples/w3c/convert-tests.sh b/test/samples/w3c/convert-tests.sh
index 5ee8faa..4c47c71 100755
--- a/test/samples/w3c/convert-tests.sh
+++ b/test/samples/w3c/convert-tests.sh
@@ -11,3 +11,10 @@ do
 	echo "Processing $TXML to $DEST"
 	java -jar /Users/sradomski/Developer/Applications/SaxonHE9-4-0-7J/saxon9he.jar $TXML confEcma.xsl -o:$DEST
 done
+
+for TXML in $TXMLS
+do
+	DEST=xpath/`basename $TXML .txml`.scxml
+	echo "Processing $TXML to $DEST"
+	java -jar /Users/sradomski/Developer/Applications/SaxonHE9-4-0-7J/saxon9he.jar $TXML confXPath.xsl -o:$DEST
+done
diff --git a/test/samples/w3c/ecma/test193.scxml b/test/samples/w3c/ecma/test193.scxml
new file mode 100644
index 0000000..441a658
--- /dev/null
+++ b/test/samples/w3c/ecma/test193.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that omitting target and targetexpr of <send> when using the
+basichttp event i/o processor puts error.communication on the internal queue.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- this should put an error in the internal queue -->
+   <send event="event1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+   <send event="fail"/>
+    </onentry>
+  
+  <transition event="error.communication" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test344.scxml b/test/samples/w3c/ecma/test344.scxml
index cd1c8a2..068581d 100644
--- a/test/samples/w3c/ecma/test344.scxml
+++ b/test/samples/w3c/ecma/test344.scxml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that a non-boolean cond expression evaluates to false and causes error.execution to be raised --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="ecmascript" initial="s0">
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a cond expression that cannot be evaluated as a 
+boolean cond expression evaluates to false and causes error.execution to be raised.
+In some languages, any valid expression/object can be converted to a boolean, so conf:nonBoolean will
+have to be mapped onto something that produces a syntax error or something similarly invalid --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="ecmascript" initial="s0">
 
 <state id="s0"> 
   <transition cond="return" target="fail"/>
diff --git a/test/samples/w3c/ecma/test488.scxml b/test/samples/w3c/ecma/test488.scxml
index 45e775c..8e007e3 100644
--- a/test/samples/w3c/ecma/test488.scxml
+++ b/test/samples/w3c/ecma/test488.scxml
@@ -24,7 +24,7 @@
  event has empty event.data -->
  
  <state id="s1">
-   <transition event="done.state.s0" cond="_event.data === ''" target="pass"/>
+   <transition event="done.state.s0" cond="_event.data == null" target="pass"/>
    <transition event="*" target="fail"/>
    </state>
 
diff --git a/test/samples/w3c/ecma/test509.scxml b/test/samples/w3c/ecma/test509.scxml
new file mode 100644
index 0000000..de55b5d
--- /dev/null
+++ b/test/samples/w3c/ecma/test509.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that Basic HTTP Event I/O processor uses POST method and that it can receive messages
+at the accessURI --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     </onentry>
+     <!-- if the event was send by http and we get it, we succeed -->
+    <transition event="test" cond="_event.raw.search('POST') !== -1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test510.scxml b/test/samples/w3c/ecma/test510.scxml
new file mode 100644
index 0000000..45d3057
--- /dev/null
+++ b/test/samples/w3c/ecma/test510.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that Basic HTTP messages go into external queue.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     <!-- this creates an internal event -->
+     <raise event="internal"/>
+  
+      </onentry>
+     <!-- we should get 'internal' first, then 'test' -->
+  <transition event="internal" target="s1"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+ <state id="s1">
+   <transition event="test" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test518.scxml b/test/samples/w3c/ecma/test518.scxml
new file mode 100644
index 0000000..69f171c
--- /dev/null
+++ b/test/samples/w3c/ecma/test518.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that namelist values get encoded as POST parameters.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+<datamodel>
+  <data id="Var1" expr="2"/>
+  </datamodel>
+
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" namelist="Var1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+      </onentry>
+     
+  <transition event="test" cond="_event.raw.search(/Var1=2/) !== -1" target="pass"/>
+  <transition event="*" target="fail"/>
+
+ </state>
+ 
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test519.scxml b/test/samples/w3c/ecma/test519.scxml
new file mode 100644
index 0000000..6f559da
--- /dev/null
+++ b/test/samples/w3c/ecma/test519.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <param> values get encoded as POST parameters.  . --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <param name="param1" expr="1"/>
+       </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" cond="_event.raw.search(/Varparam1=1/) !== -1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test520.scxml b/test/samples/w3c/ecma/test520.scxml
new file mode 100644
index 0000000..daaf3a8
--- /dev/null
+++ b/test/samples/w3c/ecma/test520.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <content> gets sent as the body of the message.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <content>this is some content</content>
+      </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="HTTP.POST" cond="_event.raw.search(/this is some content/) !== -1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test522.scxml b/test/samples/w3c/ecma/test522.scxml
new file mode 100644
index 0000000..3f16dac
--- /dev/null
+++ b/test/samples/w3c/ecma/test522.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that location field the entry for Basic HTTP Event I/O processor can be used
+to send a message to the processor --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="_ioprocessors['basichttp']['location']"/>
+
+     </onentry>
+     <!-- the event we receive should be called 'test', but that's not actually
+     required for this test. Only that the send deliver some event to us.  So if
+     we get something other than timeout or error, we call it success -->
+  <transition event="timeout" target="fail"/>
+  <transition event="error" target="fail"/>
+  <transition event="*" target="pass"/>
+
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test531.scxml b/test/samples/w3c/ecma/test531.scxml
new file mode 100644
index 0000000..9eaa3f3
--- /dev/null
+++ b/test/samples/w3c/ecma/test531.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that the value of the <param> _scxmleventname gets used as the name
+of the raised event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <content>_scxmleventname=test</content>
+      </send>  
+     </onentry>
+     
+     <!-- if we get an event named 'test' we succeed. Otherwise fail -->
+  <transition event="test" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test532.scxml b/test/samples/w3c/ecma/test532.scxml
new file mode 100644
index 0000000..412310c
--- /dev/null
+++ b/test/samples/w3c/ecma/test532.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that if _scxmleventname  is not present, the name of the HTTP method is used
+as the name of the resulting event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <!-- this content will be ignored, but it's here to make sure we have a message body -->
+      <content>some content</content>
+      </send>  
+     </onentry>
+     
+  <transition event="HTTP.POST" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test534.scxml b/test/samples/w3c/ecma/test534.scxml
new file mode 100644
index 0000000..9495d9e
--- /dev/null
+++ b/test/samples/w3c/ecma/test534.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <send> 'event' value gets sent as the param _scxmleventname . --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+        </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" cond="_event.raw.search(/Var_scxmleventname=test/) !== -1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test543.scxml b/test/samples/w3c/ecma/test543.scxml
new file mode 100644
index 0000000..2c5c6de
--- /dev/null
+++ b/test/samples/w3c/ecma/test543.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that event fields are present as children of _event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+ 
+  
+<state id="s0">
+  <onentry>
+  <!-- event isn't bound until an event is raised -->
+   <raise event="someevent"/>
+  </onentry>
+  <!-- origintype sendid, invokeid and data will not be bound in this event. name, type, and origin
+  are guaranteed to be there. -->
+   <transition event="*" cond="$_event/name and $_event/origin and $_event/type" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test567.scxml b/test/samples/w3c/ecma/test567.scxml
new file mode 100644
index 0000000..465105b
--- /dev/null
+++ b/test/samples/w3c/ecma/test567.scxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that any content in the message other than _scxmleventname is used to populate
+_event.data.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+<datamodel>
+ <data id="Var1" expr="2"/>
+  </datamodel>
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+ <!-- in this case, 'test' will be placed in _scxmleventname.  The <param> should
+ be used to populate _event.data -->
+    <send event="test" targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <param name="param1" expr="2"/>
+      </send>  
+     </onentry>
+     
+     <!-- if we get this event, we succeed -->
+  <transition event="test" target="s1">
+    <assign location="Var1" expr="_event.data.param1"/>
+      </transition>
+  <transition event="*" target="fail"/>
+ </state>
+  
+  <state id="s1">
+    <transition cond="Var1==2" target="pass"/>
+    <transition target="fail"/>
+    </state>
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/ecma/test568.scxml b/test/samples/w3c/ecma/test568.scxml
index 03d32dd..e8b888f 100644
--- a/test/samples/w3c/ecma/test568.scxml
+++ b/test/samples/w3c/ecma/test568.scxml
@@ -4,7 +4,7 @@ send events. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http:
 
   
 <state id="s0">
-  <transition cond="$_ioprocessors/processor[@name='scxml']/location/text()" target="pass"/>
+  <transition cond="$_ioprocessors/[@name='http://www.w3.org/TR/scxml/#SCXMLEventProcessor']/location/text()" target="pass"/>
   <transition target="fail"/>
    
  </state>
diff --git a/test/samples/w3c/txml/test193.txml b/test/samples/w3c/txml/test193.txml
new file mode 100644
index 0000000..ba1598b
--- /dev/null
+++ b/test/samples/w3c/txml/test193.txml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- we test that omitting target and targetexpr of <send> when using the
+basichttp event i/o processor puts error.communication on the internal queue.  -->
+
+<scxml initial="s0" version="1.0" conf:datamodel=""  xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- this should put an error in the internal queue -->
+   <send event="event1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+   <send event="fail"/>
+    </onentry>
+  
+  <transition event="error.communication" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+
+<conf:pass/>
+<conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test344.txml b/test/samples/w3c/txml/test344.txml
index 8bf6270..7723f78 100644
--- a/test/samples/w3c/txml/test344.txml
+++ b/test/samples/w3c/txml/test344.txml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- test that a non-boolean cond expression evaluates to false and causes error.execution to be raised -->
+<!-- test that a cond expression that cannot be evaluated as a 
+boolean cond expression evaluates to false and causes error.execution to be raised.
+In some languages, any valid expression/object can be converted to a boolean, so conf:nonBoolean will
+have to be mapped onto something that produces a syntax error or something similarly invalid -->
 <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" 
 	conf:datamodel="" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0">
 
diff --git a/test/samples/w3c/txml/test488.txml b/test/samples/w3c/txml/test488.txml
index c0bb5e4..49c338a 100644
--- a/test/samples/w3c/txml/test488.txml
+++ b/test/samples/w3c/txml/test488.txml
@@ -27,7 +27,7 @@
  event has empty event.data -->
  
  <state id="s1">
-   <transition event="done.state.s0" conf:eventdataVal="" conf:targetpass=""/>
+   <transition event="done.state.s0" conf:emptyEventData="" conf:targetpass=""/>
    <transition event="*" conf:targetfail=""/>
    </state>
 
diff --git a/test/samples/w3c/txml/test509.txml b/test/samples/w3c/txml/test509.txml
new file mode 100644
index 0000000..3140456
--- /dev/null
+++ b/test/samples/w3c/txml/test509.txml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<!-- test that Basic HTTP Event I/O processor uses POST method and that it can receive messages
+at the accessURI -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     </onentry>
+     <!-- if the event was send by http and we get it, we succeed -->
+    <transition event="test" conf:methodIsPost="" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test510.txml b/test/samples/w3c/txml/test510.txml
new file mode 100644
index 0000000..9ffa2ea
--- /dev/null
+++ b/test/samples/w3c/txml/test510.txml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!-- test that Basic HTTP messages go into external queue.   -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     <!-- this creates an internal event -->
+     <raise event="internal"/>
+  
+      </onentry>
+     <!-- we should get 'internal' first, then 'test' -->
+  <transition event="internal" target="s1"/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+ 
+ <state id="s1">
+   <transition event="test" conf:targetpass=""/>
+   <transition event="*" conf:targetfail=""/>
+   </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test518.txml b/test/samples/w3c/txml/test518.txml
new file mode 100644
index 0000000..b1314ee
--- /dev/null
+++ b/test/samples/w3c/txml/test518.txml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<!-- test that that namelist values get encoded as POST parameters.  -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+<datamodel>
+  <data conf:id="1" conf:expr="2"/>
+  </datamodel>
+
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send  event="test" conf:basicHTTPAccessURITarget="" conf:namelist="1"
+    type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+      </onentry>
+     
+  <transition event="test" conf:eventIdParamHasValue="1 2" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+
+ </state>
+ 
+   <conf:pass/>
+   <conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test519.txml b/test/samples/w3c/txml/test519.txml
new file mode 100644
index 0000000..67b64cc
--- /dev/null
+++ b/test/samples/w3c/txml/test519.txml
@@ -0,0 +1,21 @@
+<!-- test that that <param> values get encoded as POST parameters.  . -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send  event="test" conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <param name="param1" conf:expr="1"/>
+       </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" conf:eventNamedParamHasValue="param1 1"  conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test520.txml b/test/samples/w3c/txml/test520.txml
new file mode 100644
index 0000000..32ada62
--- /dev/null
+++ b/test/samples/w3c/txml/test520.txml
@@ -0,0 +1,21 @@
+<!-- test that that <content> gets sent as the body of the message.  -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send  conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <content>this is some content</content>
+      </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="HTTP.POST" conf:messageBodyEquals="this is some content" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test522.txml b/test/samples/w3c/txml/test522.txml
new file mode 100644
index 0000000..2d7b35d
--- /dev/null
+++ b/test/samples/w3c/txml/test522.txml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<!-- test that location field the entry for Basic HTTP Event I/O processor can be used
+to send a message to the processor -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" 
+conf:basicHTTPAccessURITarget=""/>
+
+     </onentry>
+     <!-- the event we receive should be called 'test', but that's not actually
+     required for this test. Only that the send deliver some event to us.  So if
+     we get something other than timeout or error, we call it success -->
+  <transition event="timeout" conf:targetfail=""/>
+  <transition event="error" conf:targetfail=""/>
+  <transition event="*" conf:targetpass=""/>
+
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test531.txml b/test/samples/w3c/txml/test531.txml
new file mode 100644
index 0000000..cffe7b5
--- /dev/null
+++ b/test/samples/w3c/txml/test531.txml
@@ -0,0 +1,22 @@
+<!-- test that that the value of the <param> _scxmleventname gets used as the name
+of the raised event. -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send   conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <content>_scxmleventname=test</content>
+      </send>  
+     </onentry>
+     
+     <!-- if we get an event named 'test' we succeed. Otherwise fail -->
+  <transition event="test" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test532.txml b/test/samples/w3c/txml/test532.txml
new file mode 100644
index 0000000..e8de172
--- /dev/null
+++ b/test/samples/w3c/txml/test532.txml
@@ -0,0 +1,22 @@
+<!-- test that that if _scxmleventname  is not present, the name of the HTTP method is used
+as the name of the resulting event. -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send   conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <!-- this content will be ignored, but it's here to make sure we have a message body -->
+      <content>some content</content>
+      </send>  
+     </onentry>
+     
+  <transition event="HTTP.POST" conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test534.txml b/test/samples/w3c/txml/test534.txml
new file mode 100644
index 0000000..e02123d
--- /dev/null
+++ b/test/samples/w3c/txml/test534.txml
@@ -0,0 +1,20 @@
+<!-- test that that <send> 'event' value gets sent as the param _scxmleventname . -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send  event="test" conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+        </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" conf:eventNamedParamHasValue="_scxmleventname test"  conf:targetpass=""/>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test543.txml b/test/samples/w3c/txml/test543.txml
new file mode 100644
index 0000000..d179749
--- /dev/null
+++ b/test/samples/w3c/txml/test543.txml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+ <!-- test that event fields are present as children of _event -->
+ 
+ <scxml xmlns="http://www.w3.org/2005/07/scxml" name="scxmltest" 
+   xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ 
+  
+<state id="s0">
+  <onentry>
+  <!-- event isn't bound until an event is raised -->
+   <raise event="someevent"/>
+  </onentry>
+  <!-- origintype sendid, invokeid and data will not be bound in this event. name, type, and origin
+  are guaranteed to be there. -->
+   <transition  event="*" cond="$_event/name and $_event/origin and $_event/type" conf:targetpass=""/>
+   <transition  event="*" conf:targetfail=""/>
+  </state>
+    
+<conf:pass/>
+<conf:fail/>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test567.txml b/test/samples/w3c/txml/test567.txml
new file mode 100644
index 0000000..d15953f
--- /dev/null
+++ b/test/samples/w3c/txml/test567.txml
@@ -0,0 +1,32 @@
+<!-- test that that any content in the message other than _scxmleventname is used to populate
+_event.data.  -->
+
+<scxml initial="s0" conf:datamodel=""  version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+<datamodel>
+ <data conf:id="1" conf:expr="2"/>
+  </datamodel>
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+ <!-- in this case, 'test' will be placed in _scxmleventname.  The <param> should
+ be used to populate _event.data -->
+    <send  event="test" conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <param name="param1" conf:expr="2"/>
+      </send>  
+     </onentry>
+     
+     <!-- if we get this event, we succeed -->
+  <transition event="test" target="s1">
+    <assign conf:location="1" conf:eventDataParamValue="param1"/>
+      </transition>
+  <transition event="*" conf:targetfail=""/>
+ </state>
+  
+  <state id="s1">
+    <transition conf:idVal="1=2" conf:targetpass=""/>
+    <transition conf:targetfail=""/>
+    </state>
+   <conf:pass/>
+   <conf:fail/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/txml/test568.txml b/test/samples/w3c/txml/test568.txml
index ab00644..89efe73 100644
--- a/test/samples/w3c/txml/test568.txml
+++ b/test/samples/w3c/txml/test568.txml
@@ -8,7 +8,7 @@ send events. -->
 
   
 <state id="s0">
-  <transition cond="$_ioprocessors/scxml/location/text()" conf:targetpass=""/>
+  <transition cond="$_ioprocessors/[@name='http://www.w3.org/TR/scxml/#SCXMLEventProcessor']/location/text()" conf:targetpass=""/>
   <transition conf:targetfail=""/>
    
  </state>
diff --git a/test/samples/w3c/xpath/test144.scxml b/test/samples/w3c/xpath/test144.scxml
new file mode 100644
index 0000000..612f793
--- /dev/null
+++ b/test/samples/w3c/xpath/test144.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that events are inserted into the queue in the order in which they are raised.  If
+foo occurs before bar, success, otherwise failure --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+  <transition event="foo" target="s1"/>
+  <transition event="*" target="fail"/>
+   
+ </state>
+
+<state id="s1">
+  <transition event="bar" target="pass"/>
+  <transition event="*" target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test147.scxml b/test/samples/w3c/xpath/test147.scxml
new file mode 100644
index 0000000..d07b56d
--- /dev/null
+++ b/test/samples/w3c/xpath/test147.scxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the first clause that evaluates to true - and only that clause - is executed.
+Only one event should be raised, and it should be bar --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+  <if cond="0&gt;1">
+    <raise event="foo"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+  <elseif cond="true()"/>
+    <raise event="bar"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+  <else/>
+    <raise event="baz"/>
+   <assign location="$Var1" expr="$Var1 + 1"/>
+    </if>
+   <raise event="bat"/>
+    </onentry>
+  <transition event="bar" cond="$Var1/text() =1" target="pass"/>
+  <transition event="*" target="fail"/>
+   
+ </state>
+
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test148.scxml b/test/samples/w3c/xpath/test148.scxml
new file mode 100644
index 0000000..805c223
--- /dev/null
+++ b/test/samples/w3c/xpath/test148.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the else clause executes if <if> and <elseif> evaluate to false.
+Baz should be the only event generated by the <if>.  bat is raised to catch the case where the <else> clause
+fails and baz is not generated, i.e. it makes sure that the test doesn't hang.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+  <if cond="0&gt;1">
+    <raise event="foo"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+  <elseif cond="0&gt;1"/>
+    <raise event="bar"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+  <else/>
+    <raise event="baz"/>
+   <assign location="$Var1" expr="$Var1 + 1"/>
+    </if>
+   <raise event="bat"/>
+    </onentry>
+  <transition event="baz" cond="$Var1/text() =1" target="pass"/>
+  <transition event="*" target="fail"/>
+   
+ </state>
+
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test149.scxml b/test/samples/w3c/xpath/test149.scxml
new file mode 100644
index 0000000..547fdc3
--- /dev/null
+++ b/test/samples/w3c/xpath/test149.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that neither if clause executes, so that bat is the only event raised. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+  <if cond="0&gt;1">
+    <raise event="foo"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+  <elseif cond="0&gt;1"/>
+    <raise event="bar"/>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+ </if>
+   <raise event="bat"/>
+    </onentry>
+  <transition event="bat" cond="$Var1/text() =0" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test150.scxml b/test/samples/w3c/xpath/test150.scxml
new file mode 100644
index 0000000..afa8909
--- /dev/null
+++ b/test/samples/w3c/xpath/test150.scxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach causes a new variable to be declared if 'item' doesn't already exist.  Also
+test that it will use an existing var if it does exist. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1"/>
+  <data id="Var2"/>
+  <data id="Var3">
+    <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+    </data>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+<!-- first use declared variables -->
+        <foreach item="Var1" index="Var2" array="$Var3/*"/>
+        <raise event="foo"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s1"/> 
+   </state>
+   
+<state id="s1">
+     <onentry>
+<!-- now use undeclared variables -->
+        <foreach item="Var4" index="Var5" array="$Var3/*"/>
+        <raise event="bar"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s2"/> 
+   </state>
+
+<state id="s2">
+  <!-- check that var4 is bound -->
+  <transition cond="$Var4/* or $Var4/text()" target="pass"/>
+  <transition target="fail"/>
+  </state>  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test151.scxml b/test/samples/w3c/xpath/test151.scxml
new file mode 100644
index 0000000..5933b09
--- /dev/null
+++ b/test/samples/w3c/xpath/test151.scxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach causes a new variable to be declared if 'item' doesn't already exist.  Also
+test that it will use an existing var if it does exist. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1"/>
+  <data id="Var2"/>
+  <data id="Var3">
+    <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+    </data>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+<!-- first use declared variables -->
+        <foreach item="Var1" index="Var2" array="$Var3/*"/>
+        <raise event="foo"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s1"/> 
+   </state>
+   
+<state id="s1">
+     <onentry>
+<!-- now use undeclared variables -->
+        <foreach item="Var4" index="Var5" array="$Var3/*"/>
+        <raise event="bar"/>
+        </onentry>
+   <transition event="error" target="fail"/>
+   <transition event="*" target="s2"/> 
+   </state>
+
+<state id="s2">
+  <!-- check that var5 is bound -->
+  <transition cond="$Var5/* or $Var5/text()" target="pass"/>
+  <transition target="fail"/>
+  </state>  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test152.scxml b/test/samples/w3c/xpath/test152.scxml
new file mode 100644
index 0000000..1ebbf38
--- /dev/null
+++ b/test/samples/w3c/xpath/test152.scxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an illegal array or item value causes error.execution and results in executable content
+not being executed. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  <data id="Var2"/>
+  <data id="Var3"/>
+  <data id="Var4" expr="("/>
+  <data id="Var5">
+    <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+    </data>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+<!-- invalid array, legal item -->
+        <foreach item="Var2" index="Var3" array="$Var4/text()">
+          <assign location="$Var1" expr="$Var1 + 1"/>
+          </foreach>
+        <raise event="foo"/>
+        </onentry>
+   <transition event="error.execution" target="s1"/>
+   <transition event="*" target="fail"/> 
+   </state>
+   
+   <state id="s1">
+      <onentry>
+<!-- illegal item, legal array -->
+        <foreach item=".." index="Var3" array="$Var5/*">
+          <assign location="$Var1" expr="$Var1 + 1"/>
+          </foreach>
+        <raise event="bar"/>
+        </onentry>
+   <transition event="error.execution" target="s2"/>
+   <transition event="bar" target="fail"/> 
+   </state>
+
+<state id="s2">
+  <!-- check that var1 has its original value (so executable content never got executed -->
+  <transition cond="$Var1/text() =0" target="pass"/>
+  <transition target="fail"/>
+  </state> 
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test153.scxml b/test/samples/w3c/xpath/test153.scxml
new file mode 100644
index 0000000..35b22bc
--- /dev/null
+++ b/test/samples/w3c/xpath/test153.scxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach goes over the array in the right order.  since the array contains 1 2 3, we compare the current 
+value with the previous value, which is stored in var1. The current value should always be larger.  If
+it ever isn't, set Var4 to 0, indicating failure --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/> <!-- contains the previous value -->
+  <data id="Var2"/> <!-- the item which will contain the current value -->
+  <data id="Var3">
+    <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+    </data>
+  <data id="Var4" expr="1"/> <!-- 1 if success, 0 if failure -->
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+        <foreach item="Var2" array="$Var3/*">
+         <if cond="$Var1/text() &lt;$Var2/text() ">
+         <assign location="$Var1" expr="$Var2/text()"/>
+         <else/>
+         <!-- values are out of order, record failure -->
+         <assign location="$Var4" expr="0"/>
+         </if>
+          </foreach>
+        </onentry>
+
+  <!-- check that var1 has its original value  -->
+  <transition cond="$Var4/text() =0" target="fail"/>
+  <transition target="pass"/>
+  </state> 
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test155.scxml b/test/samples/w3c/xpath/test155.scxml
new file mode 100644
index 0000000..553861e
--- /dev/null
+++ b/test/samples/w3c/xpath/test155.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach executes the executable content once for each item in the list '(1,2,3)'. The executable
+content sums the items into var1 so it should be 6 at the end --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<datamodel>
+  <data id="Var1" expr="0"/>
+  <data id="Var2"/>
+  <data id="Var3">
+    <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+    </data>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+        <foreach item="Var2" array="$Var3/*">
+          <assign location="$Var1" expr="$Var1/text() + $Var2/text()"/>
+          </foreach>
+        </onentry>
+
+  <transition cond="$Var1/text() =6" target="pass"/>
+  <transition target="fail"/>
+  </state> 
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test156.scxml b/test/samples/w3c/xpath/test156.scxml
new file mode 100644
index 0000000..3ed65b4
--- /dev/null
+++ b/test/samples/w3c/xpath/test156.scxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an error causes the foreach to stop execution.  The second piece of executable content
+should cause an error, so var1 should be incremented only once --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<datamodel>
+  <data id="Var1" expr="0"/>
+  <data id="Var2"/>
+  <data id="Var3">
+  <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+  </data>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+        <foreach item="Var2" array="$Var3/*">
+          <assign location="$Var1" expr="$Var1 + 1"/>
+          <!-- assign an illegal value to a non-existent var -->
+          <assign location="$Var5" expr="!1"/>
+          </foreach>
+        </onentry>
+
+  <transition cond="$Var1/text() =1" target="pass"/>
+  <transition target="fail"/>
+  </state> 
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test158.scxml b/test/samples/w3c/xpath/test158.scxml
new file mode 100644
index 0000000..c682c5f
--- /dev/null
+++ b/test/samples/w3c/xpath/test158.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that executable content executes in document order.  if event1 occurs then event2, succeed, otherwise fail --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <raise event="event1"/>
+   <raise event="event2"/>
+    </onentry>
+  <transition event="event1" target="s1"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+<state id="s1">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test159.scxml b/test/samples/w3c/xpath/test159.scxml
new file mode 100644
index 0000000..70a325d
--- /dev/null
+++ b/test/samples/w3c/xpath/test159.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that any error raised by an element of executable content causes all subsequent elements to be skipped.
+The send tag will raise an error so var1 should not be incremented.  If it is fail, otherwise succeed --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <send event="thisWillFail" conf:illegaltarget=""/>
+   <conf:incrementId id="1"/>
+    </onentry>
+  <transition cond="$Var1/text() =1" target="fail"/>
+  <transition target="pass"/>
+ </state>
+
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test172.scxml b/test/samples/w3c/xpath/test172.scxml
new file mode 100644
index 0000000..9a8e019
--- /dev/null
+++ b/test/samples/w3c/xpath/test172.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that eventexpr uses the current value of var1, not its initial value  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="'event1'"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="'event2'"/>
+   <send eventexpr="$Var1"/>
+    </onentry>
+    
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test173.scxml b/test/samples/w3c/xpath/test173.scxml
new file mode 100644
index 0000000..3e4a97d
--- /dev/null
+++ b/test/samples/w3c/xpath/test173.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that targetexpr uses the current value of var1, not its initial value
+(If it uses the initial value, it will generate an error.  If it uses the current value, event1 will be raised  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="27"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="'#_internal'"/>
+   <send targetexpr="$Var1" event="event1"/>
+    </onentry>
+    
+  <transition event="event1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test174.scxml b/test/samples/w3c/xpath/test174.scxml
new file mode 100644
index 0000000..5a7254e
--- /dev/null
+++ b/test/samples/w3c/xpath/test174.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that typeexpr uses the current value of var1, not its initial value
+(If it uses the initial value, it will generate an error.  If it uses the current value, event1 will be raised  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="27"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="'http://www.w3.org/TR/scxml/#SCXMLEventProcessor'"/>
+   <send typeexpr="$Var1" event="event1"/>
+    </onentry>
+    
+  <transition event="event1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test175.scxml b/test/samples/w3c/xpath/test175.scxml
new file mode 100644
index 0000000..8dfd670
--- /dev/null
+++ b/test/samples/w3c/xpath/test175.scxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that delayexpr uses the current value of var1, not its initial value
+(If it uses the initial value, event2 will be generated first, before event1.  If it uses the current value, 
+event1 will be raised first.  Succeed if event1 occurs before event2, otherwise fail --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="'0s'"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="'3s'"/>
+   <send delayexpr="$Var1" event="event2"/>
+   <send delay="1s" event="event1"/>
+    </onentry>
+    
+  <transition event="event1" target="s1"/>
+  <transition event="event2" target="fail"/>
+ </state>
+
+<state id="s1">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test176.scxml b/test/samples/w3c/xpath/test176.scxml
new file mode 100644
index 0000000..7b59453
--- /dev/null
+++ b/test/samples/w3c/xpath/test176.scxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that <param> uses the current value of var1, not its initial value.  If the value of
+aParam in event1 is 2 so that var2 gets set to 2, success, otherwise failure  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  <data id="Var2"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="2"/>
+   <send event="event1">
+     <param name="aParam" expr="$Var1/text()"/>
+     </send>
+    </onentry>
+    
+  <transition event="event1" target="s1">
+  <assign location="$Var2" expr="$_event/data/data[@id='aParam']/text()"/>
+  </transition>
+  <transition event="*" target="fail"/>
+ </state>
+
+<state id="s1">
+  <transition cond="$Var2/text() =2" target="pass"/>
+  <transition target="fail"/>
+  </state>
+     
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test178.scxml b/test/samples/w3c/xpath/test178.scxml
new file mode 100644
index 0000000..86922d1
--- /dev/null
+++ b/test/samples/w3c/xpath/test178.scxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that multiple key/value pairs are included, even when the keys are the same.
+This is a manual test.  The tester must look at the log output and verify that both
+keys are there.  (This test uses the SCXML Event I/O processor, which is the only
+one that all platforms must support.  It does not specify the message format, so 
+we cannot test _event.raw directly.  Therefore we print it out for visual 
+inspection.) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  
+<state id="s0">
+  <onentry>
+   <send event="event1">
+    <param name="Var1" expr="2"/>
+    <param name="Var1" expr="3"/>
+    </send>
+     </onentry>
+
+  <transition event="event1" target="final">
+   <log label="_event " expr="$_event/raw/text()"/>
+   </transition>
+  <transition event="*" target="fail"/>
+ 
+ </state>
+
+
+<final id="final"/>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test179.scxml b/test/samples/w3c/xpath/test179.scxml
new file mode 100644
index 0000000..1c281b5
--- /dev/null
+++ b/test/samples/w3c/xpath/test179.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that <content> can be used to populate body of a message --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+   <send event="event1">
+   <content>123</content>
+   </send>
+    </onentry>
+    
+  <transition event="event1" cond="$_event/data = '123'" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test183.scxml b/test/samples/w3c/xpath/test183.scxml
new file mode 100644
index 0000000..dcb5bb3
--- /dev/null
+++ b/test/samples/w3c/xpath/test183.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that <send> stores the value of the sendid in idlocation.  If it does,
+var1 has a value and we pass.  Otherwise we fail  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1"/>
+
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <send event="event1" idlocation="$Var1"/>
+    </onentry>
+    
+  <transition cond="$Var1/* or $Var1/text()" target="pass"/>
+  <transition target="fail"/>
+ </state>
+
+     
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test185.scxml b/test/samples/w3c/xpath/test185.scxml
new file mode 100644
index 0000000..c6b4b48
--- /dev/null
+++ b/test/samples/w3c/xpath/test185.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that <send> respects the delay specification.  If it does, event1 arrives before event2
+ and we pass.  Otherwise we fail  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+   <send event="event2" delay="2s"/>
+   <send event="event1"/>
+    </onentry>
+    
+  <transition event="event1" target="s1"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+<state id="s1">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+       
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test186.scxml b/test/samples/w3c/xpath/test186.scxml
new file mode 100644
index 0000000..8353bf2
--- /dev/null
+++ b/test/samples/w3c/xpath/test186.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that <send> evals its args when it is evaluated, not when the delay interval expires and the
+message is actually sent.  If it does, aParam will have the value of 1 (even though var1 has been incremented
+in the interval.)  If var2 ends up == 1, we pass.  Otherwise we fail  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+ <data id="Var1" expr="1"/>
+ <data id="Var2"/>
+ </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <send event="event1" delay="2s">
+     <param name="aParam" expr="$Var1/text()"/>
+     </send>
+   <assign location="$Var1" expr="2"/>
+    </onentry>
+    
+  <transition event="event1" target="s1">
+    <assign location="$Var2" expr="$_event/data/data[@id='aParam']/text()"/>
+    </transition>
+  <transition event="*" target="fail"/>
+ </state>
+
+<state id="s1">
+  <transition cond="$Var2/text() =1" target="pass"/>
+  <transition target="fail"/>
+  </state>
+       
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test187.scxml b/test/samples/w3c/xpath/test187.scxml
new file mode 100644
index 0000000..12cbb8b
--- /dev/null
+++ b/test/samples/w3c/xpath/test187.scxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that delayed <send> is not sent if the sending session terminates.  In this case,
+a subscript is invoked which sends the event childToParent delayed by 1 second, and then terminates.  The
+parent session, should not receive childToParent. If it does, we fail.  Otherwise the 
+10 sec timer expires and we pass --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+    <onentry>
+      <send event="timeout" delay="10s"/>
+      </onentry>
+    <invoke type="scxml">
+    <content>
+      <!-- exit before the delayed send can execute -->
+         <scxml initial="sub0" version="1.0" datamodel="xpath">
+           <state id="sub0">
+              <onentry>
+                <send event="childToParent" target="#_parent" delay="1s"/>
+            </onentry>
+          <transition target="subFinal"/>
+          </state>
+      <final id="subFinal"/>
+    </scxml>
+    </content>
+   </invoke>
+   
+    <transition event="childToParent" target="fail"/>
+    <transition event="timeout" target="pass"/>
+</state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test189.scxml b/test/samples/w3c/xpath/test189.scxml
new file mode 100644
index 0000000..3b5d34e
--- /dev/null
+++ b/test/samples/w3c/xpath/test189.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that #_internal as a target of <send> puts the event on the internal queue.  If it does,
+event1 will be processed before event2, because event1 is added to the internal queue while event2 is
+added to the external queue (event though event2 is generated first)  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- goes to the external queue -->
+   <send event="event2"/>
+   <!-- to the internal queue -->
+   <send event="event1" target="#_internal"/>
+    </onentry>
+ 
+ <!-- once we've entered the state, we should check for internal events first -->   
+  <transition event="event1" target="pass"/>
+  <transition event="event2" target="fail"/>
+ </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test190.scxml b/test/samples/w3c/xpath/test190.scxml
new file mode 100644
index 0000000..7458f66
--- /dev/null
+++ b/test/samples/w3c/xpath/test190.scxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that #_scxml_sessionid as a target of <send> puts the event on the external queue.  If it does,
+event1 will be processed before event2, because event1 is added to the internal queue while event2 is
+added to the external queue (event though event2 is generated first).  we have to make sure that event2
+is actually delivered.  The delayed <send> makes sure another event is generated (so the test doesn't hang) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+ <data id="Var1" expr="'#_scxml_'"/>
+ <data id="Var2" expr="$_sessionid"/>
+ </datamodel>
+  
+<state id="s0">
+  <onentry>
+  <assign location="$Var1" expr="concat($Var1, $Var2)"/>
+   <!-- goes to the external queue -->
+   <send event="event2" targetexpr="$Var1"/>
+   <!-- to the internal queue -->
+   <raise event="event1"/>
+   <!-- this should get added to the external queue after event2 -->
+   <send event="timeout"/>
+    </onentry>
+ 
+ <!-- once we've entered the state, we should check for internal events first -->   
+  <transition event="event1" target="s1"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+<!-- now check that we get event2 and not a timeout -->
+<state id="s1">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test191.scxml b/test/samples/w3c/xpath/test191.scxml
new file mode 100644
index 0000000..25862ac
--- /dev/null
+++ b/test/samples/w3c/xpath/test191.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that #_parent works as  a target of  <send> .  a subscript is invoked and sends the event 
+childToParent to its parent session (ths session) using #_parent as the target. If we get this event, we
+pass, otherwise we fail.  The timer insures that some event is generated and that the test does not hang. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+    <onentry>
+      <send event="timeout" delay="5s"/>
+      </onentry>
+    <invoke type="scxml">
+    <content>
+       <!-- send an event to the parent session using #_parent as the target -->
+        <scxml initial="sub0" version="1.0" datamodel="xpath">
+          <state id="sub0">
+            <onentry>
+             <send event="childToParent" target="#_parent"/>
+             </onentry>
+          <transition target="subFinal"/>
+         </state>
+       <final id="subFinal"/>
+        </scxml> 
+    </content>
+    </invoke>
+    <transition event="childToParent" target="pass"/>
+    <transition event="*" target="pass"/>
+</state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test192.scxml b/test/samples/w3c/xpath/test192.scxml
new file mode 100644
index 0000000..81d185d
--- /dev/null
+++ b/test/samples/w3c/xpath/test192.scxml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that #_invokeid works as  a target of  <send> .  A child  script is invoked and sends us
+childToParent once its running.  Then we send it the event parentToChild using its invokeid as the target.  
+If it receives this event, it sends sends the event eventReceived to its parent session (ths session). 
+If we get this event, we pass, otherwise the child script eventually times out sends invoke.done and we fail.
+We also set a timeout in this process to make sure the test doesn't hang  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+  
+<state id="s0" initial="s01">
+  <onentry>
+   <send event="timeout" delay="5s"/>
+   </onentry>
+   
+  <invoke type="scxml" id="invokedChild">
+    <content>
+    <!-- let the parent session know we're running by sending childToParent, then wait for parentToChild.
+       If we get it, send eventReceived.  If we don't we eventually time out -->
+          <scxml initial="sub0" version="1.0" datamodel="xpath">
+ 
+         <state id="sub0">
+            <onentry>
+           <send event="childToParent" target="#_parent"/>
+            <send event="timeout" delay="3s"/>
+          </onentry>
+    
+        <transition event="parentToChild" target="subFinal">
+          <send target="#_parent" event="eventReceived"/>
+         </transition>
+    
+          <transition event="timeout" target="subFinal"/>
+         </state>
+
+        <final id="subFinal"/>
+
+         </scxml>
+      </content>
+     </invoke>
+     
+  <transition event="timeout" target="fail"/> 
+  <transition event="done.invoke" target="fail"/>
+  
+<state id="s01">
+    <transition event="childToParent" target="s02">
+         <send target="#_invokedChild" event="parentToChild"/>
+     </transition>
+</state>
+
+<state id="s02">
+  <transition event="eventReceived" target="pass"/>
+  </state>
+
+</state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test193.scxml b/test/samples/w3c/xpath/test193.scxml
new file mode 100644
index 0000000..58a5c67
--- /dev/null
+++ b/test/samples/w3c/xpath/test193.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that omitting target and targetexpr of <send> when using the
+basichttp event i/o processor puts error.communication on the internal queue.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- this should put an error in the internal queue -->
+   <send event="event1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+   <send event="fail"/>
+    </onentry>
+  
+  <transition event="error.communication" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test194.scxml b/test/samples/w3c/xpath/test194.scxml
new file mode 100644
index 0000000..523400b
--- /dev/null
+++ b/test/samples/w3c/xpath/test194.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that specifying an illegal target for <send> causes the event error.execution to be raised.  If it does,
+we succeed.  Otherwise we eventually timeout and fail.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- should cause an error -->
+   <send target="baz" event="event2"/>
+   <!-- this will get added to the external event queue after the error has been raised -->
+   <send event="timeout"/>
+    </onentry>
+ 
+ <!-- once we've entered the state, we should check for internal events first -->   
+  <transition event="error.execution" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test198.scxml b/test/samples/w3c/xpath/test198.scxml
new file mode 100644
index 0000000..23ca478
--- /dev/null
+++ b/test/samples/w3c/xpath/test198.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that if type is not provided <send> uses the scxml event i/o processor.  The only way to tell
+what processor was used is to look at the origintype of the resulting event  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<state id="s0">
+  <onentry>
+   <send event="event1"/>
+   <send event="timeout"/>
+    </onentry>
+
+  
+  <transition event="event1" cond="$_event/origintype/text() = 'http://www.w3.org/TR/scxml/#SCXMLEventProcessor'" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test199.scxml b/test/samples/w3c/xpath/test199.scxml
new file mode 100644
index 0000000..9c8f734
--- /dev/null
+++ b/test/samples/w3c/xpath/test199.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that using an invalid send type results in error.execution --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<state id="s0">
+  <onentry>
+   <send type="27" event="event1"/>
+   <send event="timeout"/>
+    </onentry>
+ 
+ 
+  <transition event="error.execution" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test200.scxml b/test/samples/w3c/xpath/test200.scxml
new file mode 100644
index 0000000..182ada4
--- /dev/null
+++ b/test/samples/w3c/xpath/test200.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the processor supports the scxml event i/o processor --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+<state id="s0">
+  <onentry>
+   <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="event1"/>
+   <send event="timeout"/>
+    </onentry>
+ 
+ 
+  <transition event="event1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test201.scxml b/test/samples/w3c/xpath/test201.scxml
new file mode 100644
index 0000000..f988e7e
--- /dev/null
+++ b/test/samples/w3c/xpath/test201.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the processor supports the basic http event i/o processor.  This is an optional
+test since platforms are not required to support basic http event i/o --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<state id="s0">
+  <onentry>
+   <send type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" event="event1"/>
+   <send event="timeout"/>
+    </onentry>
+ 
+ 
+  <transition event="event1" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test205.scxml b/test/samples/w3c/xpath/test205.scxml
new file mode 100644
index 0000000..d6a02e2
--- /dev/null
+++ b/test/samples/w3c/xpath/test205.scxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the processor doesn't  change the message.  We can't test that it never does this, but
+at least we can check that the event name and included data are the same as we sent.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+   <data id="Var1"/>
+   </datamodel>
+   
+<state id="s0">
+  <onentry>
+   <send event="event1">
+     <param name="aParam" expr="1"/>
+     </send>
+   <send event="timeout"/>
+    </onentry>
+ 
+ 
+  <transition event="event1" target="s1">
+     <assign location="$Var1" expr="$_event/data/data[@id='aParam']/text()"/>
+     </transition>
+  <transition event="*" target="fail"/>
+ </state>
+
+<state id="s1">
+  <transition cond="$Var1/text() =1" target="pass"/>
+  <transition target="fail"/>
+  </state> 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test207.scxml b/test/samples/w3c/xpath/test207.scxml
new file mode 100644
index 0000000..e74ec8f
--- /dev/null
+++ b/test/samples/w3c/xpath/test207.scxml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that that we can't  cancel an event in another session.  We invoke a child process.  It notifies
+us when it has generated a delayed event with sendid foo.  We try to cancel foo.  The child  process sends us event
+ event success if the event is not cancelled, event fail otherwise.  This doesn't test that there is absolutely no way to cancel an event
+raised in another session, but the spec doesn't define any way to refer to an event in another process  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+   
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="10s"/>
+    </onentry>
+  <invoke type="scxml">
+    <content>
+    <!-- when invoked, we raise a delayed event1 with sendid 'foo' and notify our parent.  Then we wait.
+      If event1 occurs, the parent hasn't succeeded in canceling it and we return pass.  If event2 occurs
+      it means event1 was canceled (because event2 is delayed longer than event1) and we return 'fail'.  -->
+
+
+         <scxml initial="sub0" version="1.0" datamodel="xpath">
+           <state id="sub0">
+            <onentry>
+             <send event="event1" id="foo" delay="3s"/>
+              <send event="event2" delay="5s"/>
+              <send target="#_parent" event="childToParent"/>
+              </onentry>
+ 
+               <transition event="event1" target="subFinal">
+                   <send target="#_parent" event="pass"/>
+                   </transition>
+               <transition event="*" target="subFinal">
+                      <send target="#_parent" event="fail"/>
+              </transition>
+ 
+               </state>
+            <final id="subFinal"/>
+           </scxml>
+    </content>
+    </invoke>
+  
+  <state id="s01">
+    <transition event="childToParent" target="s02">
+      <cancel sendid="foo"/>
+      </transition>
+   </state>
+   
+ <state id="s02">
+  <transition event="pass" target="pass"/>
+  <transition event="fail" target="fail"/>
+  <transition event="timeout" target="fail"/>
+ </state>
+ 
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test208.scxml b/test/samples/w3c/xpath/test208.scxml
new file mode 100644
index 0000000..e768e7c
--- /dev/null
+++ b/test/samples/w3c/xpath/test208.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that cancel works.  We cancel delayed event1.  If cancel works, we get event2 first and pass.  If
+we get event1 or an error first, cancel didn't work and we fail.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+   
+<state id="s0">
+  <onentry>
+   <send id="foo" event="event1" delay="1s"/>
+   <send event="event2" delay="5s"/>
+   <cancel sendid="foo"/>
+    </onentry>
+
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+ 
+ </state>
+
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test210.scxml b/test/samples/w3c/xpath/test210.scxml
new file mode 100644
index 0000000..5ec8f23
--- /dev/null
+++ b/test/samples/w3c/xpath/test210.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that sendidexpr works with cancel.  If it takes the most recent value of var1, it should cancel 
+delayed event1.  Thus we get event2 first and pass.  If we get event1 or an error first, cancel didn't work and we fail.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="'bar'"/>
+  </datamodel>
+   
+<state id="s0">
+  <onentry>
+   <send id="foo" event="event1" delay="1s"/>
+   <send event="event2" delay="5s"/>
+   <assign location="$Var1" expr="'foo'"/>
+   <cancel sendidexpr="$Var1"/>
+    </onentry>
+
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+ 
+ </state>
+
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test215.scxml b/test/samples/w3c/xpath/test215.scxml
new file mode 100644
index 0000000..4aebe84
--- /dev/null
+++ b/test/samples/w3c/xpath/test215.scxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that typexpr is evaluated at runtime.  If the original value of var1 is used, the invocation
+will fail (test215sub1.scxml is not of type 'foo', even if the platform supports foo as a type).  If
+the runtime value is used, the invocation will succeed --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+<datamodel>
+  <data id="Var1" expr="'foo'"/>
+   </datamodel> 
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="5s"/>
+    <assign location="$Var1" expr="'http://www.w3.org/TR/scxml/'"/>
+    </onentry>
+  <invoke typeexpr="$Var1">
+    <content>
+        <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
+        <scxml initial="subFinal" datamodel="xpath" version="1.0">
+      <final id="subFinal"/>
+        </scxml>
+    </content>
+    </invoke>
+  <transition event="done.invoke" target="pass"/>
+  <transition event="*" target="fail"/> 
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test216.scxml b/test/samples/w3c/xpath/test216.scxml
new file mode 100644
index 0000000..901ad6f
--- /dev/null
+++ b/test/samples/w3c/xpath/test216.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that srcexpr is evaluated at runtime.  If the original value of var1 is used, the invocation
+will fail (assuming that there is no script named 'foo').  If
+the runtime value is used, the invocation will succeed --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<datamodel>
+  <data id="Var1" expr="'foo'"/>
+   </datamodel> 
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="5s"/>
+   <assign location="$Var1" expr="'file:test216sub1.scxml'"/>
+    </onentry>
+  <invoke srcexpr="$Var1" type="http://www.w3.org/TR/scxml"/>
+  <transition event="done.invoke" target="pass"/>
+  <transition event="*" target="fail"/> 
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test216sub1.scxml b/test/samples/w3c/xpath/test216sub1.scxml
new file mode 100644
index 0000000..f5c49a1
--- /dev/null
+++ b/test/samples/w3c/xpath/test216sub1.scxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="final" version="1.0" datamodel="xpath">
+
+<final id="final"/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test220.scxml b/test/samples/w3c/xpath/test220.scxml
new file mode 100644
index 0000000..15f66ba
--- /dev/null
+++ b/test/samples/w3c/xpath/test220.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the scxml type is supported.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="5s"/>
+    </onentry>
+     <invoke type="http://www.w3.org/TR/scxml/">
+     <content>
+       <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
+         <scxml initial="subFinal" version="1.0" datamodel="xpath">
+           <final id="subFinal"/>
+          </scxml></content>
+     </invoke>
+  <transition event="done.invoke" target="pass"/>
+  <transition event="*" target="fail"/> 
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test223.scxml b/test/samples/w3c/xpath/test223.scxml
new file mode 100644
index 0000000..08f2ee4
--- /dev/null
+++ b/test/samples/w3c/xpath/test223.scxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that idlocation is supported.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="Var1"/>
+   </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+     <invoke type="http://www.w3.org/TR/scxml/" idlocation="$Var1">
+     <content>
+     <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
+       <scxml initial="subFinal" version="1.0" datamodel="xpath">
+       <final id="subFinal"/>
+        </scxml>
+       </content>
+    </invoke>
+  <transition event="*" target="s1"/>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1/* or $Var1/text()" target="pass"/>
+  <transition target="fail"/>
+  </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test224.scxml b/test/samples/w3c/xpath/test224.scxml
new file mode 100644
index 0000000..8c74c4e
--- /dev/null
+++ b/test/samples/w3c/xpath/test224.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the automatically generated id has the form stateid.platformid.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="Var1"/>
+   <data id="Var2" expr="'s0.'"/>
+   </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+ <invoke type="http://www.w3.org/TR/scxml/" idlocation="$Var1">
+    <content> 
+    <!-- when invoked, terminate returning done.invoke. This proves that the invocation succeeded.   -->
+      <scxml version="1.0" initial="subFinal" datamodel="xpath">
+      <final id="subFinal"/>
+      </scxml>
+     </content>
+    </invoke>
+
+  <transition event="*" target="s1"/>
+</state>
+
+<state id="s1">
+  <transition cond="&#xA;contains($Var1, $Var2)" target="pass"/>
+  <transition target="fail"/>
+  </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test225.scxml b/test/samples/w3c/xpath/test225.scxml
new file mode 100644
index 0000000..a43cdab
--- /dev/null
+++ b/test/samples/w3c/xpath/test225.scxml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the automatically generated id is unique, we call invoke twice and compare the ids.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="Var1"/>
+   <data id="Var2"/>
+   </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+
+   <invoke type="http://www.w3.org/TR/scxml/" idlocation="$Var1">
+      <content>
+      <scxml initial="subFinal1" version="1.0" datamodel="xpath">
+         <final id="subFinal1"/>
+        </scxml>
+     </content>
+     </invoke>
+   <invoke type="http://www.w3.org/TR/scxml/" idlocation="$Var2">
+      <content>
+      <scxml initial="subFinal2" version="1.0" datamodel="xpath">
+         <final id="subFinal2"/>
+        </scxml>
+     </content>
+     </invoke>
+
+  <transition event="*" target="s1"/>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1/text()=$Var2/text()" target="fail"/>
+  <transition target="pass"/>
+  </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test226.scxml b/test/samples/w3c/xpath/test226.scxml
new file mode 100644
index 0000000..4b717b2
--- /dev/null
+++ b/test/samples/w3c/xpath/test226.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- this is basically just a test that invoke works correctly and that you can pass data
+to the invoked process.  If the invoked session finds aParam==1, it exits, signalling
+success.  otherwise it will hang and the timeout in this doc signifies failure.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+
+ 
+   <invoke type="http://www.w3.org/TR/scxml/" src="file:test226sub1.scxml">
+      <param name="Var1" expr="1"/>
+      </invoke>
+
+  <transition event="varBound" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test226sub1.scxml b/test/samples/w3c/xpath/test226sub1.scxml
new file mode 100644
index 0000000..9ac7b9a
--- /dev/null
+++ b/test/samples/w3c/xpath/test226sub1.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- when invoked, if var1 has a value notify parent. Then terminate.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+<datamodel>
+  <data id="Var1"/>
+  </datamodel>
+
+<state id="s0">
+  <transition cond="$Var1/* or $Var1/text()" target="final">
+    <send target="#_parent" event="varBound"/>
+    </transition>
+  <transition target="final"/>
+  </state>
+  
+<final id="final"/>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test228.scxml b/test/samples/w3c/xpath/test228.scxml
new file mode 100644
index 0000000..9afa343
--- /dev/null
+++ b/test/samples/w3c/xpath/test228.scxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the invokeid is included in events returned from the invoked process.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="Var1"/>
+   </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+ 
+  <invoke type="http://www.w3.org/TR/scxml/" id="foo">
+   <content>
+     <scxml initial="subFinal" version="1.0" datamodel="xpath">
+      <final id="subFinal"/>
+       </scxml>
+    </content>
+    </invoke>
+
+  <transition event="done.invoke" target="s1">
+    <assign location="$Var1" expr="$_event/invokeid/text()"/>
+    </transition>
+  <transition event="*" target="fail"/>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1='foo'" target="pass"/>
+  <transition target="fail"/>
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test229.scxml b/test/samples/w3c/xpath/test229.scxml
new file mode 100644
index 0000000..747f77c
--- /dev/null
+++ b/test/samples/w3c/xpath/test229.scxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that autofoward works. If the child  process receives back a copy of the
+childToParent event that it sends to this doc, it sends eventReceived, signalling success. (Note
+that this doc is not required to process that event explicitly.  It should be forwarded in any case.) Otherwise
+it eventually times out and the done.invoke signals failure   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+ 
+  <invoke type="http://www.w3.org/TR/scxml/" autoforward="true">
+    <content>
+      <!-- when invoked, send childToParent to parent.  
+      If it is forwarded back to us, send
+      eventReceived to signal success and terminate.  
+      Otherwise wait for timer to expire and terminate.  -->
+     <scxml initial="sub0" version="1.0" datamodel="xpath">
+        <state id="sub0">
+          <onentry>
+             <send target="#_parent" event="childToParent"/> 
+              <send event="timeout" delay="3s"/> 
+            </onentry> 
+         <transition event="childToParent" target="subFinal">
+         <send target="#_parent" event="eventReceived"/>
+          </transition>
+           <transition event="*" target="subFinal"/>
+       </state>
+        <final id="subFinal"/>
+        </scxml>
+    </content>
+    </invoke>
+
+  <transition event="childToParent"/>
+  <transition event="eventReceived" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test230.scxml b/test/samples/w3c/xpath/test230.scxml
new file mode 100644
index 0000000..51f8529
--- /dev/null
+++ b/test/samples/w3c/xpath/test230.scxml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- a manual test that an autofowarded event has the same fields and values as the original event.
+the child process sends the parent process an event which is forwarded back to it.  
+Both the parent and child process print out the contents of the event. The tester 
+must check if they are the same and report his result.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/" autoforward="true">
+    <content>
+    <!-- when invoked, send childToParent to parent.  If it is forwarded back to us, print out its
+        fields and terminate.  -->
+        <scxml initial="sub0" version="1.0" datamodel="xpath">
+           <state id="sub0">
+            <onentry>
+              <send target="#_parent" event="childToParent"/> 
+              <send event="timeout" delay="2s"/>
+             </onentry> 
+           <transition event="childToParent" target="subFinal">
+                  <log label="name is " expr="$_event/name/text()"/>
+                  <log label="type is " expr="$_event/type/text()"/>
+                  <log label="sendid is " expr="$_event/sendid/text()"/>
+                 <log label="origin is " expr="$_event/origin/text()"/>
+                 <log label="origintype is " expr="$_event/origintype/text()"/>
+                 <log label="invokeid is " expr="$_event/invokeid/text()"/>
+                 <log label="data is " expr="$_event/data/text()"/>
+              </transition>
+          <transition event="*" target="subFinal"/>  
+          </state>
+        <final id="subFinal"/>
+       </scxml>
+       </content>
+       </invoke>
+  <transition event="timeout" target="final"/>
+   
+ 
+  <state id="s01">
+  <transition event="childToParent" target="s02">
+    <log label="name is " expr="$_event/name/text()"/>
+    <log label="type is " expr="$_event/type/text()"/>
+    <log label="sendid is " expr="$_event/sendid/text()"/>
+    <log label="origin is " expr="$_event/origin/text()"/>
+    <log label="origintype is " expr="$_event/origintype/text()"/>
+    <log label="invokeid is " expr="$_event/invokeid/text()"/>
+    <log label="data is " expr="$_event/data/text()"/>
+    </transition>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+ <state id="s02">
+  <!-- wait till we get the done event to ensure that the child process has time to print out its results -->
+   <transition event="done.invoke" target="final"/>
+   </state>
+
+</state>
+
+<final id="final"/>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test232.scxml b/test/samples/w3c/xpath/test232.scxml
new file mode 100644
index 0000000..f40627b
--- /dev/null
+++ b/test/samples/w3c/xpath/test232.scxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a parent process can receive multiple events from a child process   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/">
+    <content>
+    <scxml initial="subFinal" version="1.0" datamodel="xpath">
+      <final id="subFinal">
+           <onentry>
+             <send target="#_parent" event="childToParent1"/> 
+               <send target="#_parent" event="childToParent2"/>
+             </onentry> 
+       </final>
+         </scxml>
+    </content>
+    </invoke>
+  <transition event="timeout" target="fail"/>
+   
+ 
+  <state id="s01">
+  <transition event="childToParent1" target="s02"/>
+ </state>
+ 
+ <state id="s02">
+   <transition event="childToParent2" target="s03"/>
+   </state>
+   
+<state id="s03">
+  <transition event="done.invoke" target="pass"/>
+  </state>   
+
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test233.scxml b/test/samples/w3c/xpath/test233.scxml
new file mode 100644
index 0000000..c4d7eb7
--- /dev/null
+++ b/test/samples/w3c/xpath/test233.scxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that finalize markup runs before the event is processed.  The invoked process will
+return 2 in _event.data.aParam, so that new value should be in force when we select
+the transtitions.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/">
+     <content>
+      <scxml initial="subFinal" version="1.0" datamodel="xpath">
+          <final id="subFinal">
+            <onentry>
+            <send target="#_parent" event="childToParent">
+            <param name="aParam" expr="2"/>
+               </send> 
+          </onentry> 
+          </final>
+         </scxml>
+     </content>
+        <finalize>
+      <assign location="$Var1" expr="$_event/data/data[@id='aParam']/text()"/>
+      </finalize>
+      </invoke>
+      
+  <transition event="childToParent" cond="" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>   
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test234.scxml b/test/samples/w3c/xpath/test234.scxml
new file mode 100644
index 0000000..bf06eba
--- /dev/null
+++ b/test/samples/w3c/xpath/test234.scxml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that only finalize markup in the invoking state runs.  the first invoked process will
+return 2 in _event.data.aParam, while second invoked process sleeps without returning any events. 
+Only the first finalize should execute.  So when we get to s1 var1 should have value 2 but 
+var2 should still be set to 1  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="p0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  <data id="Var2" expr="1"/>
+  </datamodel>
+<parallel id="p0">
+    <onentry>
+    <send event="timeout" delay="3s"/>
+    </onentry>   
+    <transition event="timeout" target="fail"/>  
+    
+   <state id="p01">
+    <invoke type="http://www.w3.org/TR/scxml/">
+       <content>
+       <scxml version="1.0" initial="subFinal1" datamodel="xpath">
+          <final id="subFinal1">
+           <onentry>
+            <send target="#_parent" event="childToParent">
+            <param name="aParam" expr="2"/>
+          </send> 
+         </onentry> 
+          </final>
+            </scxml>
+         </content>
+      <finalize>
+        <assign location="$Var1" expr="$_event/data/data[@id='aParam']/text()"/>
+        </finalize>
+        </invoke>
+      
+      <transition event="childToParent" cond="$Var1/text() =2" target="s1"/>
+       <transition event="childToParent" target="fail"/>
+    </state> 
+
+   <state id="p02">
+     <invoke type="http://www.w3.org/TR/scxml/">
+       <content>
+       <scxml version="1.0" initial="sub0" datamodel="xpath">
+         <state id="sub0">
+           <onentry>
+              <send event="timeout" delay="2s"/>
+            </onentry>
+             <transition event="timeout" target="subFinal2"/>
+             </state>
+              <final id="subFinal2"/>
+              </scxml>
+        </content>
+      <finalize>
+        <assign location="$Var2" expr="$_event/data/data[@id='aParam']/text()"/>
+         </finalize>
+      </invoke>
+  </state>
+
+</parallel>    
+
+  
+<state id="s1">
+  <transition cond="$Var2/text() =1" target="pass"/>
+  <transition target="fail"/>
+  </state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test235.scxml b/test/samples/w3c/xpath/test235.scxml
new file mode 100644
index 0000000..1b06a4c
--- /dev/null
+++ b/test/samples/w3c/xpath/test235.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that done.invoke.id event has the right id.  the invoked child terminates immediately
+and should generate done.invoke.foo   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/" id="foo">
+    <content>
+      <scxml initial="subFinal" version="1.0" datamodel="xpath">
+        <final id="subFinal"/>
+        </scxml>
+        </content>
+        </invoke>
+      
+  <transition event="done.invoke.foo" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>   
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test236.scxml b/test/samples/w3c/xpath/test236.scxml
new file mode 100644
index 0000000..2c2d41a
--- /dev/null
+++ b/test/samples/w3c/xpath/test236.scxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that done.invoke.id event is the last event we receive.  the invoked process sends childToParent
+in the exit handler of its final state.  We should get it before the done.invoke, and we should get no
+events after the done.invoke.  Hence timeout indicates success   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/">
+    <content>
+      <scxml initial="subFinal" version="1.0" datamodel="xpath">
+       <final id="subFinal">
+          <onexit>
+           <send target="#_parent" event="childToParent"/>
+            </onexit>
+           </final>
+         </scxml>
+      </content>
+      </invoke>
+ 
+  <transition event="childToParent" target="s1"/>    
+  <transition event="done.invoke" target="fail"/>
+</state>
+
+<state id="s1">
+  <!-- here we should get done.invoke -->
+  <transition event="done.invoke" target="s2"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+<state id="s2">
+  <transition event="timeout" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>   
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test237.scxml b/test/samples/w3c/xpath/test237.scxml
new file mode 100644
index 0000000..19c2480
--- /dev/null
+++ b/test/samples/w3c/xpath/test237.scxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that cancelling works. invoked child sleeps for two seconds, then terminates.  We
+sleep for 1 sec in s0, then move to s1.  This should cause the invocation to get cancelled.
+If we receive done.invoke, the invocation wasn't cancelled, and we fail. If we receive no events by
+the time timeout2 fires, success   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout1" delay="1s"/>
+    </onentry>
+  <invoke type="http://www.w3.org/TR/scxml/">
+    <content>
+      <!-- when invoked, sleep for 2 secs then terminate.  Parent will try to cancel this session -->
+         <scxml initial="sub0" version="1.0" datamodel="xpath">
+           <state id="sub0">
+            <onentry>
+              <send event="timeout" delay="2s"/>
+                </onentry>
+               <transition event="timeout" target="subFinal"/>
+                </state>   
+            <final id="subFinal"/>
+         </scxml>
+         </content>
+          </invoke>
+ 
+  <transition event="timeout1" target="s1"/>    
+
+</state>
+
+<state id="s1">
+    <onentry>
+    <send event="timeout2" delay="2s"/>
+    </onentry>
+  <!-- here we should NOT get done.invoke -->
+  <transition event="done.invoke" target="fail"/>
+  <transition event="*" target="pass"/>
+  </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test239.scxml b/test/samples/w3c/xpath/test239.scxml
new file mode 100644
index 0000000..b7fcfc2
--- /dev/null
+++ b/test/samples/w3c/xpath/test239.scxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that markup can be specified both by 'src' and by <content>  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+    
+   <state id="s01">
+     <invoke type="http://www.w3.org/TR/scxml/" src="file:test239sub1.scxml"/>
+     <transition event="done.invoke" target="s02"/>
+   </state>
+
+<state id="s02">
+      <invoke type="http://www.w3.org/TR/scxml/">
+        <!-- identical to test239sub1.scxml.  -->
+          <content>
+            <scxml version="1.0" initial="final" datamodel="xpath">
+             <final id="final"/>
+              </scxml>
+            </content>
+        </invoke>
+ 
+  <transition event="done.invoke" target="pass"/>
+  </state>
+  
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test239sub1.scxml b/test/samples/w3c/xpath/test239sub1.scxml
new file mode 100644
index 0000000..510f4a0
--- /dev/null
+++ b/test/samples/w3c/xpath/test239sub1.scxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- when invoked, just terminate.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="final" version="1.0" datamodel="xpath">
+
+ <final id="final"/>
+ 
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test240.scxml b/test/samples/w3c/xpath/test240.scxml
new file mode 100644
index 0000000..ddf92c6
--- /dev/null
+++ b/test/samples/w3c/xpath/test240.scxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that datamodel values can be specified both by 'namelist' and by <param>.
+invoked child will return success if its Var1 is set to 1, failure otherwise. This
+test will fail schema validation because of the multiple occurences of Var1, but
+should run correctly. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+   
+   <state id="s01">
+     <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var1">
+       <content>
+         <scxml initial="sub01" version="1.0" datamodel="xpath">
+           <datamodel>
+             <data id="Var1" expr="0"/>
+               </datamodel>
+                   <state id="sub01">
+                      <transition cond="$Var1/data/text() =1" target="subFinal1">
+                     <send target="#_parent" event="success"/>
+                     </transition>
+                  <transition target="subFinal1">
+                 <send target="#_parent" event="failure"/>
+                 </transition>
+               </state>
+         <final id="subFinal1"/>
+          </scxml>
+        </content>
+        </invoke>
+     <transition event="success" target="s02"/>
+     <transition event="failure" target="fail"/>
+   </state>
+
+<state id="s02">
+      <invoke type="http://www.w3.org/TR/scxml/">
+          <param name="Var1" expr="1"/>
+       <content>
+         <scxml initial="sub02" version="1.0" datamodel="xpath">
+           <datamodel>
+             <data id="Var1" expr="0"/>
+               </datamodel>
+   
+                  <state id="sub02">
+                      <transition cond="$Var1/text() =1" target="subFinal2">
+                     <send target="#_parent" event="success"/>
+                     </transition>
+                  <transition target="subFinal1">
+                 <send target="#_parent" event="failure"/>
+                 </transition>
+               </state>
+         <final id="subFinal2"/>
+          </scxml>
+        </content>
+        </invoke>
+     <transition event="success" target="pass"/>
+     <transition event="failure" target="fail"/>
+  </state>
+ 
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test241.scxml b/test/samples/w3c/xpath/test241.scxml
new file mode 100644
index 0000000..377aa4d
--- /dev/null
+++ b/test/samples/w3c/xpath/test241.scxml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- The child process will return success ifits Var1 is set to 1, failure otherwise. For this test
+we try passing in Var1 by param and by namelist and check that we either get two successes
+or two failures.  This test will fail schema validation due to multiple  declarations of
+Var1, but should  run correctly.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+   
+   <state id="s01">
+     <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var1">
+              <content>
+            <scxml initial="sub01" version="1.0" datamodel="xpath">
+             <datamodel>
+               <data id="Var1" expr="0"/>
+                </datamodel>
+   
+           <state id="sub01">
+              <transition cond="$Var1/text() =1" target="subFinal1">
+                  <send target="#_parent" event="success"/>
+                    </transition>
+              <transition target="subFinal1">
+                    <send target="#_parent" event="failure"/>
+                </transition>
+              </state>
+     
+            <final id="subFinal1"/>
+            </scxml>
+       </content>
+       </invoke>
+     <transition event="success" target="s02"/>
+     <transition event="failure" target="s03"/>
+   </state>
+
+<state id="s02">
+      <invoke type="http://www.w3.org/TR/scxml/">
+          <param name="Var1" expr="1"/>
+          <content>
+            <scxml initial="sub02" version="1.0" datamodel="xpath">
+             <datamodel>
+               <data id="Var1" expr="0"/>
+                </datamodel>
+   
+           <state id="sub02">
+              <transition cond="$Var1/text() =1" target="subFinal2">
+                  <send target="#_parent" event="success"/>
+                    </transition>
+              <transition target="subFinal2">
+                    <send target="#_parent" event="failure"/>
+                </transition>
+              </state>
+     
+            <final id="subFinal2"/>
+            </scxml>
+       </content>
+        </invoke>
+        <!-- we got success in s01, so we need to do so here -->
+     <transition event="success" target="pass"/>
+     <transition event="failure" target="fail"/>
+  </state>
+  
+<state id="s03">
+      <invoke type="http://www.w3.org/TR/scxml/">
+          <param name="Var1" expr="1"/>
+           <content>
+            <scxml initial="sub03" version="1.0" datamodel="xpath">
+             <datamodel>
+               <data id="Var1" expr="0"/>
+                </datamodel>
+   
+           <state id="sub03">
+              <transition cond="$Var1/text() =1" target="subFinal3">
+                  <send target="#_parent" event="success"/>
+                    </transition>
+              <transition target="subFinal3">
+                    <send target="#_parent" event="failure"/>
+                </transition>
+              </state>
+     
+            <final id="subFinal3"/>
+            </scxml>
+       </content>
+        </invoke>
+        <!-- we got failure in s01, so we need to do so here -->
+     <transition event="failure" target="pass"/>
+     <transition event="success" target="fail"/>
+  </state>
+ 
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test242.scxml b/test/samples/w3c/xpath/test242.scxml
new file mode 100644
index 0000000..a6f1798
--- /dev/null
+++ b/test/samples/w3c/xpath/test242.scxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that markup specified  by 'src' and by <content> is treated the same way.  That means that
+either we get done.invoke in both cases or in neither case (in which case we timeout) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout1" delay="1s"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+
+     <invoke type="http://www.w3.org/TR/scxml/" src="file:test242sub1.scxml"/>
+     <transition event="done.invoke" target="s02"/>
+     <transition event="timeout1" target="s03"/>
+   </state>
+
+<state id="s02">
+    <onentry>
+    <send event="timeout2" delay="1s"/>
+    </onentry>
+      <invoke type="http://www.w3.org/TR/scxml/">
+        <!-- identical to test242sub1.scxml.  -->
+          <content>
+            <scxml version="1.0" initial="subFinal1" datamodel="xpath">
+             <final id="subFinal1"/>
+              </scxml>
+            </content>
+        </invoke>
+ <!-- we got done.invoke last time, so we need it this time too -->
+  <transition event="done.invoke" target="pass"/>
+  <transition event="timeout2" target="fail"/>
+ </state>
+ 
+<state id="s03">
+    <onentry>
+    <send event="timeout3" delay="1s"/>
+    </onentry>
+      <invoke type="http://www.w3.org/TR/scxml/">
+        <!-- identical to test242sub1.scxml.  -->
+          <content>
+            <scxml version="1.0" initial="subFinal2" datamodel="xpath">
+             <final id="subFinal2"/>
+              </scxml>
+            </content>
+        </invoke>
+ <!-- we got timeout last time, so we need it this time too -->
+  <transition event="timeout3" target="pass"/>
+  <transition event="done.invoke" target="fail"/>
+ </state>
+  
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test242sub1.scxml b/test/samples/w3c/xpath/test242sub1.scxml
new file mode 100644
index 0000000..510f4a0
--- /dev/null
+++ b/test/samples/w3c/xpath/test242sub1.scxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- when invoked, just terminate.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="final" version="1.0" datamodel="xpath">
+
+ <final id="final"/>
+ 
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test243.scxml b/test/samples/w3c/xpath/test243.scxml
new file mode 100644
index 0000000..dceb40e
--- /dev/null
+++ b/test/samples/w3c/xpath/test243.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that datamodel values can be specified by param.
+test240sub1 will return success ifits Var1 is set to 1, failure otherwise.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+   
+      <invoke type="http://www.w3.org/TR/scxml/">
+          <param name="Var1" expr="1"/>
+          <content>
+            <scxml version="1.0" initial="sub0" datamodel="xpath">
+             <datamodel>
+              <data id="Var1" expr="0"/>
+                </datamodel>
+   
+            <state id="sub0">
+              <transition cond="$Var1/text() =1" target="subFinal">
+                 <send target="#_parent" event="success"/>
+                   </transition>
+                  <transition target="subFinal">
+                   <send target="#_parent" event="failure"/>
+                    </transition>
+                 </state>
+              <final id="subFinal"/>
+               </scxml>
+               </content>
+           </invoke>
+     <transition event="success" target="pass"/>
+     <transition event="*" target="fail"/>
+   </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test244.scxml b/test/samples/w3c/xpath/test244.scxml
new file mode 100644
index 0000000..307e556
--- /dev/null
+++ b/test/samples/w3c/xpath/test244.scxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that datamodel values can be specified by  namelist.
+invoked child will return success ifits Var1 is set to 1, failure otherwise.  
+This test will fail schema validation due to multiple occurrences of Var1,
+but should run correctly. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+   
+     <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var1">
+        <content>
+          <scxml initial="sub0" version="1.0" datamodel="xpath">
+             <datamodel>
+             <data id="Var1" expr="0"/>
+             </datamodel>
+   
+         <state id="sub0">
+            <transition cond="$Var1/text() =1" target="subFinal">
+             <send target="#_parent" event="success"/>
+              </transition>
+             <transition target="subFinal">
+                 <send target="#_parent" event="failure"/>
+             </transition>
+           </state>    
+            <final id="subFinal"/>
+              </scxml>
+             </content>
+             </invoke>
+     <transition event="success" target="pass"/>
+     <transition event="*" target="fail"/>
+   </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test245.scxml b/test/samples/w3c/xpath/test245.scxml
new file mode 100644
index 0000000..b9cbddb
--- /dev/null
+++ b/test/samples/w3c/xpath/test245.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that non-existent datamodel values are not set.  Var2 is not defined in 
+invoked child's datamodel.  It will will return success if its Var2 remains unbound, failure otherwise.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var2" expr="3"/>
+  </datamodel>
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+   
+     <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var2">
+       <content>
+          <scxml initial="sub0" version="1.0" datamodel="xpath">
+               <state id="sub0">
+               <transition cond="$Var2/* or $Var2/text()" target="subFinal">
+                <send target="#_parent" event="failure"/>
+            </transition>
+            <transition target="subFinal">
+              <send target="#_parent" event="success"/>
+              </transition>
+          </state>    
+           <final id="subFinal"/>
+           </scxml>
+           </content>
+          </invoke>
+          
+     <transition event="success" target="pass"/>
+     <transition event="*" target="fail"/>
+   </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test247.scxml b/test/samples/w3c/xpath/test247.scxml
new file mode 100644
index 0000000..16a6a5f
--- /dev/null
+++ b/test/samples/w3c/xpath/test247.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that we get done.invoke.  timeout indicates failure  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+   
+     <invoke type="http://www.w3.org/TR/scxml/">
+       <content>
+         <scxml version="1.0" initial="subFinal" datamodel="xpath">
+           <final id="subFinal"/>
+           </scxml>
+        </content>
+        </invoke>
+     <transition event="done.invoke" target="pass"/>
+     <transition event="timeout" target="fail"/>
+   </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test250.scxml b/test/samples/w3c/xpath/test250.scxml
new file mode 100644
index 0000000..3884425
--- /dev/null
+++ b/test/samples/w3c/xpath/test250.scxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the onexit handlers run in the invoked process if it is cancelled.  This has to be a
+manual test, since this process won't accept any events from the child  process once it has been cancelled.
+Tester must examine log output from child process to determine success   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="foo"/>
+    </onentry>
+   
+     <invoke type="http://www.w3.org/TR/scxml/">
+         <content>
+           <scxml initial="sub0" version="1.0" datamodel="xpath">
+             <state id="sub0" initial="sub01">
+               <onentry>
+                <send event="timeout" delay="2s"/>
+                  </onentry>
+                 <transition event="timeout" target="subFinal"/>
+              <onexit>
+                 <log expr="'Exiting sub0'"/>
+                </onexit> 
+             <state id="sub01">
+             <onexit>
+             <log expr="'Exiting sub01'"/>
+           </onexit>
+        </state>
+      </state>     
+        <final id="subFinal">
+          <onentry>
+           <log expr="'entering final state, invocation was not cancelled'"/>
+          </onentry>
+         </final> 
+      </scxml>
+      </content>
+      </invoke>
+      
+     <!-- this transition will cause the invocation to be cancelled -->
+     <transition event="foo" target="final"/>
+   </state>
+ 
+<final id="final"/>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test252.scxml b/test/samples/w3c/xpath/test252.scxml
new file mode 100644
index 0000000..1f92127
--- /dev/null
+++ b/test/samples/w3c/xpath/test252.scxml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that we don't process any events received from the invoked process once it is cancelled.  child
+process tries to send us childToParent in an onexit handler.  If we get it, we fail.  
+timeout indicates success.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    
+    <transition event="timeout" target="pass"/>
+    <transition event="childToParent" target="fail"/>
+    <transition event="done.invoke" target="fail"/>
+    
+    <state id="s01">
+      <onentry>
+        <send event="foo"/>
+        </onentry>
+   
+     <invoke type="http://www.w3.org/TR/scxml/">
+       <content>
+         <scxml initial="sub0" version="1.0" datamodel="xpath">
+              <state id="sub0">
+             <onentry>
+             <send event="timeout" delay="2s"/>
+             </onentry> 
+            <transition event="timeout" target="subFinal"/>
+               <onexit>
+               <send target="#_parent" event="childToParent"/>
+            </onexit>
+          </state>  
+          <final id="subFinal"/>
+          </scxml>
+       </content>
+      </invoke>
+      
+     <!-- this transition will cause the invocation to be cancelled -->
+     <transition event="foo" target="s02"/>
+   </state>
+   
+   <state id="s02"/>
+   
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test253.scxml b/test/samples/w3c/xpath/test253.scxml
new file mode 100644
index 0000000..f894ea9
--- /dev/null
+++ b/test/samples/w3c/xpath/test253.scxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the scxml event processor is used in both directions.  If child process uses the 
+scxml event i/o processor to communicate with us, send it an event.  It will send back success if
+this process uses the scxml processor to send the message to it, otherwise failure.  For this test we allow 
+'scxml' as an alternative to the full url.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1"/>
+  </datamodel>
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    
+    <transition event="timeout" target="fail"/>
+    
+    <invoke type="scxml" id="foo">
+      <content>
+      <!-- inform parent we're running then wait for it to send us an event.  If it uses the scxml event i/o
+             processor to do so, return success, otherwise return failure.   -->
+       <scxml initial="sub0" version="1.0" datamodel="xpath">
+         <datamodel>
+          <data id="Var2"/>
+           </datamodel>
+            <state id="sub0">
+              <onentry>
+               <send target="#_parent" event="childRunning"/>
+            </onentry>
+   
+           <transition event="parentToChild" target="sub1">
+           <assign location="$Var2" expr="$_event/origintype/text()"/>
+          </transition>
+         </state>
+          <state id="sub1">
+            <transition cond="$Var2='http://www.w3.org/TR/scxml/#SCXMLEventProcessor'" target="subFinal">
+             <send target="#_parent" event="success"/>
+                </transition>
+            <transition cond="$Var2='scxml'" target="subFinal">
+             <send target="#_parent" event="success"/>
+              </transition>
+            <transition target="subFinal">
+                <send target="#_parent" event="failure"/>
+             </transition>
+           </state>
+          <final id="subFinal"/>
+            </scxml>
+        </content>
+        </invoke>
+    
+    <state id="s01">
+    <transition event="childRunning" target="s02">
+       <assign location="$Var1" expr="$_event/origintype/text()"/>
+       </transition>
+   </state>
+    
+    <state id="s02">
+
+     <transition cond="$Var1='http://www.w3.org/TR/scxml/#SCXMLEventProcessor'" target="s03">
+        <send target="#_foo" event="parentToChild"/>
+        </transition>
+    <transition cond="$Var1='scxml'" target="s03">
+        <send target="#_foo" event="parentToChild"/>
+        </transition>
+ 
+    <transition target="fail"/>
+
+    </state>        
+
+     
+     <state id="s03">
+       <transition event="success" target="pass"/>
+       <transition event="fail" target="fail"/>
+  
+     </state>   
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test276.scxml b/test/samples/w3c/xpath/test276.scxml
new file mode 100644
index 0000000..026e0fc
--- /dev/null
+++ b/test/samples/w3c/xpath/test276.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that values passed in from parent process override default values specified in the child, test276sub1.scxml.
+The child returns event1 if var1 has value 1, event0 if it has default value 0.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+   <state id="s0">
+     <invoke type="scxml" src="file:test276sub1.scxml">
+       <param name="Var1" expr="1"/>
+       </invoke>
+       <transition event="event1" target="pass"/>
+       <transition event="event0" target="fail"/>
+   </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test276sub1.scxml b/test/samples/w3c/xpath/test276sub1.scxml
new file mode 100644
index 0000000..5c6ab45
--- /dev/null
+++ b/test/samples/w3c/xpath/test276sub1.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- define var1 with default value 0.  Parent will invoke this process setting var1 = 1.  Return event1 if var1 == 1, event0 otherwise --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+   <datamodel>
+     <data id="Var1" expr="0"/>
+     </datamodel>
+     
+ <state id="s0">
+ 
+     
+  <transition cond="$Var1/text() =1" target="final">
+     <send target="#_parent" event="event1"/>
+     </transition>
+     
+  <transition target="final">
+     <send target="#_parent" event="event0"/>
+     </transition>
+     
+   </state>
+   
+   <final id="final"/>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test277.scxml b/test/samples/w3c/xpath/test277.scxml
new file mode 100644
index 0000000..6dc520e
--- /dev/null
+++ b/test/samples/w3c/xpath/test277.scxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that platform creates undound variable if we assign an illegal value to it.  Thus
+ we can assign to it later in state s1.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+   <datamodel>
+     <data id="Var1" expr="!1"/>
+     </datamodel>
+     
+ <state id="s0">
+    <onentry>
+    <raise event="foo"/>
+    </onentry>
+    
+   <transition event="error.execution" cond="$Var1 and not($Var1/text()) and not($Var1/*)" target="s1"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s1">
+ <onentry>
+   <assign location="$Var1" expr="1"/>
+   </onentry>
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+
+   </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test278.scxml b/test/samples/w3c/xpath/test278.scxml
new file mode 100644
index 0000000..93461be
--- /dev/null
+++ b/test/samples/w3c/xpath/test278.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+<!-- test that a variable can be accessed from a state that is outside its lexical scope -->   
+     
+ <state id="s0">
+   <transition cond="$Var1/text() =1" target="pass"/>
+
+  <transition target="fail"/>
+
+   </state>
+   
+<state id="s1">
+  <datamodel>
+    <data id="Var1" expr="1"/>
+    </datamodel>
+  </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test279.scxml b/test/samples/w3c/xpath/test279.scxml
new file mode 100644
index 0000000..314b927
--- /dev/null
+++ b/test/samples/w3c/xpath/test279.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  testing that in case of early binding variables are assigned values at init time, before
+ the state containing them is visited  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+   
+     
+ <state id="s0">
+   <transition cond="$Var1/text() =1" target="pass"/>
+
+  <transition target="fail"/>
+
+   </state>
+   
+<state id="s1">
+  <datamodel>
+    <data id="Var1" expr="1"/>
+    </datamodel>
+  </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test280.scxml b/test/samples/w3c/xpath/test280.scxml
new file mode 100644
index 0000000..79bb2e5
--- /dev/null
+++ b/test/samples/w3c/xpath/test280.scxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test late binding.  var2 won't get bound until s1 is entered, so it shouldn't  have a value in s0 and
+accessing it should cause an error. It should get bound before the onentry code in s1 so it should  be
+possible access it there and assign its value to var1 --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" binding="late">
+ 
+ <datamodel>
+   <data id="Var1"/>
+   </datamodel>  
+     
+ <state id="s0">
+   <transition cond="$Var2 and not($Var2/text()) and not($Var2/*)" target="s1"/>
+  <transition target="fail"/>
+   </state>
+   
+<state id="s1">
+  <datamodel>
+    <data id="Var2" expr="1"/>
+    </datamodel>
+    <onentry>
+    <assign location="$Var1" expr="$Var2/text()"/>
+    </onentry>
+    <transition cond="$Var1/text()=$Var2/text()" target="pass"/>
+    <transition target="fail"/>
+  </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test286.scxml b/test/samples/w3c/xpath/test286.scxml
new file mode 100644
index 0000000..80c0046
--- /dev/null
+++ b/test/samples/w3c/xpath/test286.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that assigment to a non-declared var causes an error.  the transition on foo catches the case
+where no error is raised --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+   
+     
+ <state id="s0">
+   <onentry>
+   <assign location="$Var1" expr="1"/>
+   <raise event="foo"/>
+   </onentry>
+   
+   <transition event="error.execution" target="pass"/>
+   <transition event="*" target="fail"/>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test287.scxml b/test/samples/w3c/xpath/test287.scxml
new file mode 100644
index 0000000..9d10690
--- /dev/null
+++ b/test/samples/w3c/xpath/test287.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- a simple test that a legal value may be assigned to a valid data model location --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0" initial="s0">
+   
+<datamodel>
+    <data id="Var1" expr="0"/>
+    </datamodel>   
+     
+ <state id="s0">
+   <onentry>
+   <assign location="$Var1" expr="1"/>
+   </onentry>
+   
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test294.scxml b/test/samples/w3c/xpath/test294.scxml
new file mode 100644
index 0000000..362f2a6
--- /dev/null
+++ b/test/samples/w3c/xpath/test294.scxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a param inside donedata ends up in the data field of the done event and
+that content inside donedata sets the full value of the event.data field --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+ <datamodel>
+       <data id="Var1" expr="0"/>
+    </datamodel>   
+     
+ <state id="s0" initial="s01">
+    
+   <transition event="done.state.s0" cond="$_event/data/data[@id = 'Var1']/text()=1" target="s1">
+     </transition>
+     
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <param name="Var1" expr="1"/>
+      </donedata>
+     </final>
+ </state>
+ 
+ <state id="s1" initial="s11">
+    
+   <transition event="done.state.s1" cond="$_event/data = 'foo'" target="pass">
+     </transition>
+     
+      <transition event="done.state.s1" target="fail">
+     </transition>
+
+   <state id="s11">
+   <transition target="s12"/>
+   </state>
+   <final id="s12">
+     <donedata>
+      <content>foo</content>
+      </donedata>
+     </final>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test298.scxml b/test/samples/w3c/xpath/test298.scxml
new file mode 100644
index 0000000..ab8a5a9
--- /dev/null
+++ b/test/samples/w3c/xpath/test298.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- refence a non-existent data model location in param in donedata and see that the right error is raised --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+ <datamodel>
+       <data id="Var1" expr="0"/>
+    </datamodel>   
+     
+ <state id="s0" initial="s01">
+    <transition event="error.execution" target="pass"/>
+       <transition event="*" target="fail"/>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <param name="Var3" location="$Var2"/>
+      </donedata>
+     </final>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test301.scxml b/test/samples/w3c/xpath/test301.scxml
new file mode 100644
index 0000000..59125c8
--- /dev/null
+++ b/test/samples/w3c/xpath/test301.scxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- the processor should  reject this document because it can't download the script.  
+Therefore  we fail if it runs at all. This test is valid only for datamodels that support scripting --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0">
+ <script src="D:\foo"/>
+     
+ <state id="s0">
+   <transition target="fail"/>
+   </state>
+   
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test302.scxml b/test/samples/w3c/xpath/test302.scxml
new file mode 100644
index 0000000..4ecb0b7
--- /dev/null
+++ b/test/samples/w3c/xpath/test302.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a script is evaluated at load time.  <conf:script> shoudl assign the value 1 to 
+Var1.  Hence, if script is evaluated at download time, Var1 has a value in the initial state s0.
+This test is valid only for datamodels that support scripting --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+ <script/>
+     
+ <state id="s0">
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+   </state>
+   
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test303.scxml b/test/samples/w3c/xpath/test303.scxml
new file mode 100644
index 0000000..490151a
--- /dev/null
+++ b/test/samples/w3c/xpath/test303.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- to test that scripts are run as part of executable content, we check that it changes the value of a var at the
+right point. This test is valid only for datamodels that support scripting --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+<datamodel>
+<data id="Var1" expr="0"/>
+</datamodel>
+     
+ <state id="s0">
+   <onentry>
+   <assign location="$Var1" expr="2"/>
+   <script/>
+   </onentry>
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+   </state>
+   
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test304.scxml b/test/samples/w3c/xpath/test304.scxml
new file mode 100644
index 0000000..072b188
--- /dev/null
+++ b/test/samples/w3c/xpath/test304.scxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a variable declared by a script can be accessed like any other part of the data model --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0" initial="s0">
+ <script/>
+     
+ <state id="s0">
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+   </state>
+   
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test307.scxml b/test/samples/w3c/xpath/test307.scxml
new file mode 100644
index 0000000..369b6c8
--- /dev/null
+++ b/test/samples/w3c/xpath/test307.scxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" binding="late">
+
+<!-- with binding=late, in s0 we access a variable that isn't created until we get to s1.  Then in s1
+we access a non-existent substructure of a variable.  We use log tags to report the values that both operations
+yield, and whether there are errors.  This is a manual test, since the tester must report whether the output
+is the same in the two cases -->
+
+<state id="s0">
+  <onentry>
+    <log label="entering s0 value of Var 1 is: " expr="$Var1/text()"/>
+    <raise event="foo"/>
+   </onentry>
+   <transition event="error" target="s1"> 
+     <log label="error in state s0" expr="_event"/>
+     </transition>
+   <transition event="foo" target="s1">
+     <log label="no error in s0" expr=""/>
+     </transition>
+   </state>
+   
+<state id="s1">
+  <datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+ 
+  <onentry>
+   <log label="entering s1, value of non-existent substructure of Var 1 is: " expr="$Var1.bar"/>
+   <raise event="bar"/>
+   </onentry>
+
+    <transition event="error" target="final"> 
+     <log label="error in state s1" expr="_event"/>
+     </transition>
+   <transition event="bar" target="final">
+     <log label="No error in s1" expr=""/>
+     </transition>
+
+</state>
+    
+<final id="final"/>
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test309.scxml b/test/samples/w3c/xpath/test309.scxml
new file mode 100644
index 0000000..b2ad07d
--- /dev/null
+++ b/test/samples/w3c/xpath/test309.scxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an expression that cannot be interpreted as a boolean is treated as false --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+<state id="s0"> 
+  <transition cond="==!*" target="fail"/>
+  <transition target="pass"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test310.scxml b/test/samples/w3c/xpath/test310.scxml
new file mode 100644
index 0000000..59e5bf0
--- /dev/null
+++ b/test/samples/w3c/xpath/test310.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- simple test of the in() predicate --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="p">
+
+     
+ <parallel id="p">
+ 
+   <state id="s0">
+   <transition cond="In('s1')" target="pass"/> 
+   <transition target="fail"/>
+   </state>
+
+   <state id="s1"/> 
+ </parallel>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test311.scxml b/test/samples/w3c/xpath/test311.scxml
new file mode 100644
index 0000000..487793c
--- /dev/null
+++ b/test/samples/w3c/xpath/test311.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that assignment to a non-existent location yields an error --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="1"/>
+   </onentry>
+   <transition event="error.execution" target="pass"/> 
+   <transition event=".*" target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test312.scxml b/test/samples/w3c/xpath/test312.scxml
new file mode 100644
index 0000000..45ed889
--- /dev/null
+++ b/test/samples/w3c/xpath/test312.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that assignment with an illegal expr raises an error --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+<datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="!1"/>
+   <raise event="foo"/>
+   </onentry>
+   <transition event="error.execution" target="pass"/> 
+   <transition event=".*" target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test313.scxml b/test/samples/w3c/xpath/test313.scxml
new file mode 100644
index 0000000..0816115
--- /dev/null
+++ b/test/samples/w3c/xpath/test313.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- this is a manual test. The processor is allowed to reject this doc, but if it executes it with its illegal
+expression, it must raise an error --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+<datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+
+<state id="s0">
+  <onentry>
+   <assign location="$Var1" expr="!1"/>
+   <raise event="foo"/>
+   </onentry>
+   <transition event="error.execution" target="pass"/> 
+   <transition event=".*" target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test314.scxml b/test/samples/w3c/xpath/test314.scxml
new file mode 100644
index 0000000..2d16107
--- /dev/null
+++ b/test/samples/w3c/xpath/test314.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- this is a manual test because the processor is allowed to reject this document.  But if it executes it,
+it should not raise an error until it gets to s03 and evaluates the illegal expr --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+<datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+
+
+<state id="s0" initial="s01">
+  <transition event="error.execution" target="fail"/>
+  
+   <state id="s01">
+      <transition target="s02"/>
+    </state>
+
+   <state id="s02">
+     <transition target="s03"/>
+   </state>
+
+  <state id="s03">
+    <onentry>
+     <assign location="$Var1" expr="!1"/>
+      <raise event="foo"/>
+   </onentry>
+     <transition event="error.execution" target="pass"/> 
+     <transition event=".*" target="fail"/>
+  </state>
+   
+</state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test318.scxml b/test/samples/w3c/xpath/test318.scxml
new file mode 100644
index 0000000..2ee56d8
--- /dev/null
+++ b/test/samples/w3c/xpath/test318.scxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _event stays bound during the onexit and entry into the next state --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">
+<datamodel>
+ <data id="Var1"/>
+ </datamodel>
+     
+ <state id="s0">
+   <onentry>
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" target="s1"/> 
+   </state>
+   
+ <state id="s1">
+  <onentry>
+    <raise event="bar"/>
+    <!-- _event should still be bound to 'foo' at this point -->
+    <assign location="$Var1" expr="$_event/name/text()"/>
+    </onentry>
+   <transition cond="$Var1='foo'" target="pass"/> 
+   <transition target="fail"/>
+   </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test319.scxml b/test/samples/w3c/xpath/test319.scxml
new file mode 100644
index 0000000..f168e1a
--- /dev/null
+++ b/test/samples/w3c/xpath/test319.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _event is not bound before any event has been raised --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">
+
+ <state id="s0">
+   <onentry>
+     <if cond="$_event/text()">
+       <raise event="bound"/>
+       <else/>
+         <raise event="unbound"/>
+     </if>
+   </onentry>
+   <transition event="unbound" target="pass"/>
+   <transition event="bound" target="fail"/> 
+
+   </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test321.scxml b/test/samples/w3c/xpath/test321.scxml
new file mode 100644
index 0000000..8905752
--- /dev/null
+++ b/test/samples/w3c/xpath/test321.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _sessionid is bound on startup --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">
+<datamodel>
+  <data id="Var1" expr="$_sessionid"/>
+  </datamodel>
+     
+ <state id="s0">
+<transition cond="$Var1/* or $Var1/text()" target="pass"/> 
+   <transition cond="true()" target="fail"/>
+   </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test322.scxml b/test/samples/w3c/xpath/test322.scxml
new file mode 100644
index 0000000..437ff93
--- /dev/null
+++ b/test/samples/w3c/xpath/test322.scxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _sessionid remains bound to the same value throught the session.  this means that it can't
+be assigned to  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">
+<datamodel>
+  <data id="Var1" expr="$_sessionid"/>
+  <data id="Var2"/>
+  </datamodel>
+     
+ <state id="s0">
+   <transition target="s1"/>
+
+   </state>
+   
+ <state id="s1">
+   <onentry>
+    <assign location="$_sessionid" expr="'otherName'"/>
+    <raise event="foo"/>
+    </onentry>
+ 
+   <transition event="error.execution" target="s2"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s2">
+ 
+   <transition cond="$Var1=$_sessionid" target="pass"/>
+   <transition target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test323.scxml b/test/samples/w3c/xpath/test323.scxml
new file mode 100644
index 0000000..76a519f
--- /dev/null
+++ b/test/samples/w3c/xpath/test323.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _name is bound on startup --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">
+<datamodel>
+  <data id="Var1" expr="$_name"/>
+  </datamodel>
+     
+ <state id="s0">
+<transition cond="$Var1/* or $Var1/text()" target="pass"/> 
+   <transition cond="true()" target="fail"/>
+   </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test324.scxml b/test/samples/w3c/xpath/test324.scxml
new file mode 100644
index 0000000..c3493e3
--- /dev/null
+++ b/test/samples/w3c/xpath/test324.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _name stays bound till the session ends.  This means that it cannot be assigned to --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">
+
+     
+ <state id="s0">
+   <transition cond="$_name/text() = 'machineName'" target="s1"/>
+    <transition target="fail"/>
+   </state>
+   
+ <state id="s1">
+   <onentry>
+    <assign location="$_name" expr="'otherName'"/>
+    </onentry>
+   <transition cond="$_name/text() = 'machineName'" target="pass"/>
+   <transition target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test325.scxml b/test/samples/w3c/xpath/test325.scxml
new file mode 100644
index 0000000..b85b47a
--- /dev/null
+++ b/test/samples/w3c/xpath/test325.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _ioprocessors is bound at startup.  I'm not sure how to test for a set value or
+how to test that the entries in it do represent I/O processors, since the set that each implementation
+supports may be different.  Suggestions welcome --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">
+<datamodel>
+  <data id="Var1" expr="$_ioprocessors"/>
+  </datamodel>
+
+
+ <state id="s0">
+    <transition cond="$Var1/* or $Var1/text()" target="pass"/> 
+   <transition target="fail"/>
+   </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test326.scxml b/test/samples/w3c/xpath/test326.scxml
new file mode 100644
index 0000000..f6f69bc
--- /dev/null
+++ b/test/samples/w3c/xpath/test326.scxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that _ioprocessors stays bound till the session ends.  This means that it cannot be assigned to --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">
+<datamodel>
+  <data id="Var1" expr="$_ioprocessors"/>
+  <data id="Var2"/>
+  </datamodel>
+
+ <state id="s0">
+    <transition cond="$Var1/* or $Var1/text()" target="s1"/> 
+   <transition cond="true()" target="fail"/>
+   </state> 
+      
+   
+ <state id="s1">
+   <onentry>
+    <assign location="$_ioprocessors" expr="'otherName'"/>
+    <raise event="foo"/>
+    </onentry>
+ 
+   <transition event="error.execution" target="s2"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s2">
+   <onentry>
+     <assign location="$Var2" expr="$_ioprocessors"/>
+     </onentry>
+   <transition cond="$Var1=$Var2" target="pass"/>
+   <transition target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test329.scxml b/test/samples/w3c/xpath/test329.scxml
new file mode 100644
index 0000000..ad62f10
--- /dev/null
+++ b/test/samples/w3c/xpath/test329.scxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that none of the system variables can be modified --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">
+   <datamodel>
+     <data id="Var1"/>
+     <data id="Var2"/>
+     <data id="Var3"/>
+     <data id="Var4"/>
+     </datamodel>
+        
+ <state id="s0">
+   <onentry>
+     <!-- get _event bound so we can use it in s1-->
+     <raise event="foo"/>
+     <assign location="$Var1" expr="$_sessionid"/>
+     <assign location="$_sessionid" expr="27"/>
+   </onentry>
+
+   <transition event="foo" cond="$Var1=$_sessionid" target="s1"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s1">
+  <onentry>
+     <assign location="$Var2" expr="$_event"/>
+     <assign location="$_event" expr="27"/>
+    </onentry>
+   <transition cond="$Var2=$_event" target="s2"/>
+   <transition target="fail"/>
+   </state>  
+   
+<state id="s2">
+  <onentry>
+     <assign location="$Var3" expr="$_name"/>
+     <assign location="$_name" expr="27"/>
+    </onentry>
+   <transition cond="$Var3=$_name" target="s3"/>
+   <transition target="fail"/>
+   </state> 
+
+   
+<state id="s3">
+  <onentry>
+     <assign location="$Var4" expr="$_ioprocessors"/>
+     <assign location="$_ioprocessors" expr="27"/>
+    </onentry>
+   <transition cond="$Var4=$_ioprocessors" target="pass"/>
+   <transition target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test330.scxml b/test/samples/w3c/xpath/test330.scxml
new file mode 100644
index 0000000..353c683
--- /dev/null
+++ b/test/samples/w3c/xpath/test330.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- check that the required fields are present in both internal and external events --><scxml xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" name="machineName">
+     
+ <state id="s0">
+   <onentry>
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" cond="$_event/name and $_event/type and $_event/sendid and $_event/origin and $_event/origintype and $_event/invokeid and $_event/data" target="s1"/> 
+      <transition event="*" target="fail"/> 
+   </state>
+   
+ <state id="s1">
+   <onentry>
+     <send event="foo"/>
+   </onentry>
+   <transition event="foo" cond="$_event/name and $_event/type and $_event/sendid and $_event/origin and $_event/origintype and $_event/invokeid and $_event/data" target="pass"/> 
+      <transition event="*" target="fail"/> 
+   </state>
+   
+    
+   <final xmlns="http://www.w3.org/2005/07/scxml" id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final xmlns="http://www.w3.org/2005/07/scxml" id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test331.scxml b/test/samples/w3c/xpath/test331.scxml
new file mode 100644
index 0000000..aec6d98
--- /dev/null
+++ b/test/samples/w3c/xpath/test331.scxml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0" name="machineName">
+
+<!-- test that _event.type is set correctly for internal, platform, and external events -->
+<datamodel>
+ <data id="Var1"/>
+ </datamodel>
+     
+ <state id="s0">
+   <onentry>
+   <!-- internal event -->
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" target="s1"> 
+     <assign location="$Var1" expr="$_event/type/text()"/>
+     </transition>
+      <transition event="*" target="fail"/> 
+   </state>
+
+<state id="s1">
+  <transition cond="$Var1='internal'" target="s2"/>
+  <transition target="fail"/>
+  </state>
+   
+<state id="s2">
+   <onentry>
+   <!-- this will generate an error, which is a platform event -->
+     <assign location="$Var2" expr="1"/>
+   </onentry>
+   <transition event="error" target="s3">
+     <assign location="$Var1" expr="$_event/type/text()"/>
+     </transition> 
+      <transition event="*" target="fail"/>
+   </state>
+   
+<state id="s3">
+  <transition cond="$Var1='platform'" target="s4"/>
+  <transition target="fail"/>
+  </state>
+   
+ <state id="s4">
+   <onentry>
+   <!-- external event -->
+     <send event="foo"/>
+   </onentry>
+   <transition event="foo" target="s5">
+   <assign location="$Var1" expr="$_event/type/text()"/>
+     </transition>   
+      <transition event="*" target="fail"/>
+   </state>
+   
+<state id="s5">
+  <transition cond="$Var1='external'" target="pass"/>
+  <transition target="fail"/>
+  </state>
+   
+    
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test332.scxml b/test/samples/w3c/xpath/test332.scxml
new file mode 100644
index 0000000..248f953
--- /dev/null
+++ b/test/samples/w3c/xpath/test332.scxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that sendid is present in error events triggered by send errors --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" datamodel="xpath" name="machineName">
+ <datamodel>
+   <data id="Var1"/>
+    <data id="Var2"/>
+   </datamodel>    
+
+   
+ <state id="s0">
+   <onentry>
+   <!-- this will raise an error and also store the sendid in var1 -->
+     <send target="baz" event="foo" idlocation="$Var1"/>
+   </onentry>
+   <transition event="error" target="s1">
+   <!-- get the sendid out of the error event -->
+       <assign location="$Var2" expr="$_event/sendid/text()"/>
+       </transition>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+<state id="s1">
+<!-- make sure that the sendid in the error event matches the one generated when send executed -->
+  <transition cond="$Var1/text()=$Var2/text()" target="pass"/>
+  <transition target="fail"/>
+  </state>
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test333.scxml b/test/samples/w3c/xpath/test333.scxml
new file mode 100644
index 0000000..aff67bc
--- /dev/null
+++ b/test/samples/w3c/xpath/test333.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- make sure sendid is blank in a non-error event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" datamodel="xpath" name="machineName">  
+   
+ <state id="s0">
+   <onentry>
+     <send event="foo"/>
+   </onentry>
+   <transition event="foo" cond="not(string($_event/sendid))" target="pass"/>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test335.scxml b/test/samples/w3c/xpath/test335.scxml
new file mode 100644
index 0000000..004a688
--- /dev/null
+++ b/test/samples/w3c/xpath/test335.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that origin field is blank for internal events --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" datamodel="xpath" name="machineName">  
+   
+ <state id="s0">
+   <onentry>
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" cond="not(string($_event/origin))" target="pass"/>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test336.scxml b/test/samples/w3c/xpath/test336.scxml
new file mode 100644
index 0000000..0ec410a
--- /dev/null
+++ b/test/samples/w3c/xpath/test336.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the origin field of an external event contains a URL that lets you send back to the originator.  In
+this case it's the same session, so if we get bar we succeed --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">  
+   
+ <state id="s0">
+   <onentry>
+     <send event="foo"/>
+   </onentry>
+   <transition event="foo" target="s1">
+     <send event="bar" targetexpr="$_event/origin/text()" typeexpr="$_event/origintype/text()"/>
+      </transition>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+<state id="s1">
+  <onentry>
+    <send event="baz"/>
+    </onentry>
+  <transition event="bar" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test337.scxml b/test/samples/w3c/xpath/test337.scxml
new file mode 100644
index 0000000..5bb900e
--- /dev/null
+++ b/test/samples/w3c/xpath/test337.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that origintype is blank on internal events --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0" name="machineName">  
+   
+ <state id="s0">
+   <onentry>
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" cond="not(string($_event/origintype))" target="pass"/>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test338.scxml b/test/samples/w3c/xpath/test338.scxml
new file mode 100644
index 0000000..d434749
--- /dev/null
+++ b/test/samples/w3c/xpath/test338.scxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that invokeid is set correctly in events received from an invoked process.  timeout event catches the 
+case where the invoke doesn't work correctly --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1"/>
+  <data id="Var2"/>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+        <send event="timeout" delay="2s"/>
+        </onentry>
+     <invoke idlocation="$Var1" type="http://www.w3.org/TR/scxml/">
+     <content>
+       <scxml initial="sub0" version="1.0" datamodel="xpath" name="machineName">     
+       <final id="sub0">
+         <onentry>
+            <send target="#_parent" event="event1"/>
+        </onentry>
+        </final>
+       </scxml>
+      </content>
+    </invoke>
+       <transition event="event1" target="s1">
+         <assign location="$Var2" expr="$_event/invokeid/text()"/>
+         </transition>
+       <transition event="event0" target="fail"/>
+   </state>
+
+<state id="s1">
+  <transition cond="$Var1/text()=$Var2/text()" target="pass"/>
+  <transition target="fail"/>
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test339.scxml b/test/samples/w3c/xpath/test339.scxml
new file mode 100644
index 0000000..225b64f
--- /dev/null
+++ b/test/samples/w3c/xpath/test339.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that invokeid is blank in an event that wasn't returned from an invoked process --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">  
+   
+ <state id="s0">
+   <onentry>
+     <raise event="foo"/>
+   </onentry>
+   <transition event="foo" cond="not(string($_event/invokeid))" target="pass"/>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test342.scxml b/test/samples/w3c/xpath/test342.scxml
new file mode 100644
index 0000000..5dd9b3d
--- /dev/null
+++ b/test/samples/w3c/xpath/test342.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that eventexpr works and sets the name field of the resulting event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">  
+ <datamodel>
+   <data id="Var1" expr="'foo'"/>
+   <data id="Var2"/>
+   </datamodel>
+     
+ <state id="s0">
+   <onentry>
+     <send eventexpr="$Var1"/>
+   </onentry>
+   <transition event="foo" target="s1">
+      <assign location="$Var2" expr="$_event/name/text()"/>
+      </transition>
+      <transition event="*" target="fail"/> 
+   </state>
+   
+<state id="s1">
+  <transition cond="$Var1/text()=$Var2/text()" target="pass"/>
+   <transition target="fail"/>
+   </state>
+      
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test343.scxml b/test/samples/w3c/xpath/test343.scxml
new file mode 100644
index 0000000..bae14de
--- /dev/null
+++ b/test/samples/w3c/xpath/test343.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that illegal <param> produces error.execution and empty event.data --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+     
+ <state id="s0" initial="s01">
+   <!-- we should get the error before the done event -->
+   <transition event="error.execution" target="s1"/>
+   <transition event="done.state.s0" target="fail"/>     
+
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <param location="$Varfoo" name="someParam"/>
+      </donedata>
+     </final>
+  </state>
+
+ 
+ <!-- if we get here, we received the error event. Now check that the done
+ event has empty event.data -->
+ 
+ <state id="s1">
+   <transition event="done.state.s0" cond="not($_event/data/*)" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test344.scxml b/test/samples/w3c/xpath/test344.scxml
new file mode 100644
index 0000000..15f744e
--- /dev/null
+++ b/test/samples/w3c/xpath/test344.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a cond expression that cannot be evaluated as a 
+boolean cond expression evaluates to false and causes error.execution to be raised.
+In some languages, any valid expression/object can be converted to a boolean, so conf:nonBoolean will
+have to be mapped onto something that produces a syntax error or something similarly invalid --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+<state id="s0"> 
+  <transition cond="==!*" target="fail"/>
+  <transition target="s1"/>
+  </state>
+  
+<state id="s1">
+  <onentry>
+    <raise event="foo"/>
+    </onentry>
+  <transition event="error.execution" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test346.scxml b/test/samples/w3c/xpath/test346.scxml
new file mode 100644
index 0000000..5be7844
--- /dev/null
+++ b/test/samples/w3c/xpath/test346.scxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that any attempt to change the value of a system variable causes error.execution to be raised.  
+Event1..4 are there to catch the case where the error event is not raised. In cases where it is, we have
+to dispose of eventn in the next state, hence the targetless transitions (which simply throw away the event.) --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" name="machineName">
+
+   
+ <state id="s0">
+   <onentry>
+    <assign location="$_sessionid" expr="'otherName'"/>
+    <raise event="event1"/>
+    </onentry>
+ 
+   <transition event="error.execution" target="s1"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s1">
+     <onentry>
+    <assign location="$_event" expr="'otherName'"/>
+    <raise event="event2"/>
+    </onentry>
+    <!-- throw out event1 if it's still around -->
+   <transition event="event1"/>
+   <transition event="error.execution" target="s2"/>
+   <!-- event1 would trigger this transition if we didn't drop it.  We want this transition to have
+   a very general trigger to catch cases where the wrong error event was raised -->
+   <transition event="*" target="fail"/>
+   </state>  
+   
+<state id="s2">
+     <onentry>
+    <assign location="$_ioprocessors" expr="'otherName'"/>
+    <raise event="event3"/>
+    </onentry>
+   <transition event="event2"/>
+   <transition event="error.execution" target="s3"/>
+   <transition event="*" target="fail"/>
+   </state>  
+   
+<state id="s3">
+     <onentry>
+    <assign location="$_name" expr="'otherName'"/>
+    <raise event="event4"/>
+    </onentry>
+   <transition event="event3"/>
+   <transition event="error.execution" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test347.scxml b/test/samples/w3c/xpath/test347.scxml
new file mode 100644
index 0000000..011f65f
--- /dev/null
+++ b/test/samples/w3c/xpath/test347.scxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the scxml event I/O processor works by sending events back and forth between an invoked child
+and its parent process --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+  
+<state id="s0" initial="s01">
+     <invoke id="child" type="scxml">
+      <content>
+      <scxml initial="sub0" version="1.0" datamodel="xpath" name="machineName">  
+         <state id="sub0">
+           <onentry>
+             <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_parent" event="childToParent"/>
+         </onentry>
+      <transition event="parentToChild" target="subFinal"/>
+     </state>
+     <final id="subFinal"/>
+       </scxml>
+     </content>
+        </invoke>
+   <onentry>
+     <send delay="20s" event="timeout"/>
+     </onentry>
+  <transition event="timeout" target="fail"/>
+        
+  <state id="s01">
+      <transition event="childToParent" target="s02"/>
+      </state>
+    
+   <state id="s02">
+     <onentry>
+       <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" target="#_child" event="parentToChild"/>
+       </onentry>
+   <transition event="done.invoke" target="pass"/>
+   <transition event="error" target="fail"/>
+   </state>
+</state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test348.scxml b/test/samples/w3c/xpath/test348.scxml
new file mode 100644
index 0000000..d55f797
--- /dev/null
+++ b/test/samples/w3c/xpath/test348.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+ <!-- test that event param of send sets the name of the event -->
+  
+<state id="s0">
+
+   <onentry>
+     <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="s0Event"/>
+     </onentry>
+  <transition event="s0Event" target="pass"/>
+  <transition event="*" target="fail"/>
+
+</state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test349.scxml b/test/samples/w3c/xpath/test349.scxml
new file mode 100644
index 0000000..b162edc
--- /dev/null
+++ b/test/samples/w3c/xpath/test349.scxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that value in origin field can be used to send an event back to the sender --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1"/>
+  </datamodel>
+  
+<state id="s0">
+
+   <onentry>
+     <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="s0Event"/>
+     </onentry>
+  <transition event="s0Event" target="s2">
+    <assign location="$Var1" expr="$_event/origin/text()"/>
+    </transition>
+  <transition event="*" target="fail"/>
+
+</state>
+
+<state id="s2">
+  <onentry>
+   <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" targetexpr="$Var1" event="s0Event2"/>
+   </onentry>
+   <transition event="s0Event2" target="pass"/>
+   <transition event="*" target="fail"/>
+</state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test350.scxml b/test/samples/w3c/xpath/test350.scxml
new file mode 100644
index 0000000..ce94e9f
--- /dev/null
+++ b/test/samples/w3c/xpath/test350.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that target value is used to decide what session to deliver the event to.  A session should be
+able to send an event to itself using its own session ID as the target --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+ <data id="Var1" expr="'#_scxml_' + _sessionid"/>
+ </datamodel>
+  
+<state id="s0">
+
+   <onentry>
+     <send delay="5s" event="timeout"/>
+     <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" targetexpr="$Var1" event="s0Event"/>
+     </onentry>
+  <transition event="s0Event" target="pass"/>
+  <transition event="*" target="fail"/>
+
+</state>
+
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test351.scxml b/test/samples/w3c/xpath/test351.scxml
new file mode 100644
index 0000000..f75fab3
--- /dev/null
+++ b/test/samples/w3c/xpath/test351.scxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that sendid is set in event if present in send, blank otherwise --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1"/>
+  <data id="Var2"/>
+  </datamodel>
+
+  
+<state id="s0">
+
+   <onentry>
+     <send delay="5s" event="timeout"/>
+     <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" id="send1" event="s0Event"/>  
+     </onentry>
+  <transition event="s0Event" target="s1">
+    <assign location="$Var1" expr="$_event/sendid/text()"/>
+    </transition>
+  <transition event="*" target="fail">
+    </transition>
+
+</state>
+
+<state id="s1">
+  <transition cond="$Var1='send1'" target="s2"/>
+  <transition target="fail"/>
+ </state>
+ 
+<state id="s2">
+
+   <onentry>
+     <send delay="5s" event="timeout"/>
+      <send event="s0Event2"/>
+     </onentry>
+  <transition event="s0Event2" target="s3">
+    <assign location="$Var2" expr="$_event/sendid/text()"/>
+    </transition>
+  <transition event="*" target="fail"/>
+</state>
+
+<state id="s3">
+  <transition cond="not($Var2/text() or $Var2/*)" target="pass"/>
+  <transition target="fail"/>
+ </state>
+
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test352.scxml b/test/samples/w3c/xpath/test352.scxml
new file mode 100644
index 0000000..b8ea732
--- /dev/null
+++ b/test/samples/w3c/xpath/test352.scxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test the origintype is 'http://www.w3.org/TR/scxml/#SCXMLEventProcessor' --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1"/>
+  </datamodel>
+
+  
+<state id="s0">
+   <onentry>
+     <send delay="5s" event="timeout"/>
+    <send type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor" event="s0Event"/>  
+     </onentry>
+  <transition event="s0Event" target="s1">
+    <assign location="$Var1" expr="$_event/origintype/text()"/>
+    </transition>
+  <transition event="*" target="fail">
+    </transition>
+
+</state>
+
+<state id="s1">
+  <transition cond="$Var1='http://www.w3.org/TR/scxml/#SCXMLEventProcessor'" target="pass"/>
+  <transition target="fail"/>
+ </state>
+ 
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test355.scxml b/test/samples/w3c/xpath/test355.scxml
new file mode 100644
index 0000000..af1dda6
--- /dev/null
+++ b/test/samples/w3c/xpath/test355.scxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that default initial state is first in document order.  If we enter s0 first we succeed, if s1, failure. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+
+     
+<state id="s0">
+  <transition target="pass"/>
+</state>
+
+<state id="s1">
+  <transition target="fail"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test364.scxml b/test/samples/w3c/xpath/test364.scxml
new file mode 100644
index 0000000..1130c72
--- /dev/null
+++ b/test/samples/w3c/xpath/test364.scxml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that default initial states are entered when a compound state is entered.  First we test
+the 'initial' attribute, then the initial element, then default to the first child in document order.  
+If we get to s01111 we succeed, if any other state, failure.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" initial="s1" version="1.0">
+
+<state id="s1" initial="s11p112 s11p122">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="timeout" target="fail"/>
+  <state id="s11" initial="s111">
+    <state id="s111"/>
+    <parallel id="s11p1">
+       <state id="s11p11" initial="s11p111">
+         <state id="s11p111"/>
+         <state id="s11p112">
+           <onentry>
+             <raise event="In-s11p112"/>
+             </onentry>
+         </state>
+       </state>
+       <state id="s11p12" initial="s11p121">
+        <state id="s11p121"/>
+        <state id="s11p122">
+          <transition event="In-s11p112" target="s2"/>
+          </state>
+       </state>
+      </parallel>
+  </state>
+</state>
+
+<state id="s2">
+	 <initial>
+	 	<transition target="s21p112 s21p122"/>
+	 	</initial>
+  <transition event="timeout" target="fail"/>
+  <state id="s21" initial="s211">
+    <state id="s211"/>
+    <parallel id="s21p1">
+       <state id="s21p11" initial="s21p111">
+         <state id="s21p111"/>
+         <state id="s21p112">
+           <onentry>
+             <raise event="In-s21p112"/>
+             </onentry>
+         </state>
+       </state>
+       <state id="s21p12" initial="s21p121">
+        <state id="s21p121"/>
+        <state id="s21p122">
+          <transition event="In-s21p112" target="s3"/>
+          </state>
+       </state>
+      </parallel>
+  </state>
+</state>
+      
+<state id="s3">
+ <transition target="fail"/>
+  <state id="s31">
+    <state id="s311">
+       <state id="s3111">
+           <transition target="pass"/>
+       </state>
+       <state id="s3112"/>
+    <state id="s312"/>
+  <state id="s32"/>
+</state>
+</state>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test372.scxml b/test/samples/w3c/xpath/test372.scxml
new file mode 100644
index 0000000..3ddecb6
--- /dev/null
+++ b/test/samples/w3c/xpath/test372.scxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that entering a final state generates done.state.parentid after executing the onentry elements.  
+Var1 should be set to 2 (but not 3) by the time the event is raised --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+       
+<state id="s0" initial="s0final">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="done.state.s0" cond="$Var1/text() =2" target="pass"/>
+  <transition event="*" target="fail"/>
+  
+  <final id="s0final">
+    <onentry>
+     <assign location="$Var1" expr="2"/>
+     </onentry>
+    <onexit>
+     <assign location="$Var1" expr="3"/>
+     </onexit>
+     </final>
+</state>
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test375.scxml b/test/samples/w3c/xpath/test375.scxml
new file mode 100644
index 0000000..b093149
--- /dev/null
+++ b/test/samples/w3c/xpath/test375.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that onentry handlers are executed in document order.  event1 should be raised before event2 --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+
+
+       
+<state id="s0">
+  <onentry>
+    <raise event="event1"/>
+    </onentry>
+  <onentry>
+    <raise event="event2"/>
+    </onentry>
+    
+  <transition event="event1" target="s1"/>
+  <transition event="*" target="fail"/>
+
+</state>
+
+<state id="s1">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test376.scxml b/test/samples/w3c/xpath/test376.scxml
new file mode 100644
index 0000000..3f6edc5
--- /dev/null
+++ b/test/samples/w3c/xpath/test376.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that each onentry handler is a separate block.  The <send> of event1 will cause an error but
+ the increment to var1 should happen anyways --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+       
+<state id="s0">
+  <onentry>
+    <send target="baz" event="event1"/>
+    </onentry>
+  <onentry>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onentry>
+    
+  <transition cond="$Var1/text() =2" target="pass"/>
+  <transition target="fail"/>
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test377.scxml b/test/samples/w3c/xpath/test377.scxml
new file mode 100644
index 0000000..1d2140f
--- /dev/null
+++ b/test/samples/w3c/xpath/test377.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that onexit handlers are executed in document order.  event1 should be raised before event2 --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+
+
+       
+<state id="s0">
+  <onexit>
+    <raise event="event1"/>
+    </onexit>
+  <onexit>
+    <raise event="event2"/>
+    </onexit>
+    
+  <transition target="s1"/>
+ </state>
+ 
+ <state id="s1">
+    
+  <transition event="event1" target="s2"/>
+  <transition event="*" target="fail"/>
+
+</state>
+
+<state id="s2">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test378.scxml b/test/samples/w3c/xpath/test378.scxml
new file mode 100644
index 0000000..08fd658
--- /dev/null
+++ b/test/samples/w3c/xpath/test378.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that each onexithandler is a separate block.  The <send> of event1 will cause an error but
+ the increment to var1 should happen anyways --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+ </datamodel>
+       
+<state id="s0">
+  <onexit>
+    <send target="baz" event="event1"/>
+    </onexit>
+  <onexit>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+    
+<transition target="s1"/>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1/text() =2" target="pass"/>
+  <transition target="fail"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test387.scxml b/test/samples/w3c/xpath/test387.scxml
new file mode 100644
index 0000000..7b59d23
--- /dev/null
+++ b/test/samples/w3c/xpath/test387.scxml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the default history state works correctly.  From initial state s3 we take a transition to s0's default
+shallow history state.  That should generate "enteringS011", which takes us to s4.  In s4, we
+transition to s1's default deep history state. We should end up in s122, generating "enteringS122".  Otherwise failure.--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s3" version="1.0" datamodel="xpath">
+
+       
+<state id="s0" initial="s01">
+
+  <transition event="enteringS011" target="s4"/>
+  <transition event="*" target="fail"/>
+  
+  <history type="shallow" id="s0HistShallow">
+    <transition target="s01"/>
+    </history>
+  <history type="deep" id="s0HistDeep">
+    <transition target="s022"/>
+    </history>
+  <state id="s01" initial="s011">
+    <state id="s011">
+       <onentry>
+         <raise event="enteringS011"/>
+         </onentry>
+    </state>
+    <state id="s012">
+      <onentry>
+       <raise event="enteringS012"/>
+        </onentry>
+    </state>
+  </state>
+ <state id="s02" initial="s021">
+     <state id="s021">
+       <onentry>
+         <raise event="enteringS021"/>
+         </onentry>
+    </state>
+    <state id="s022">
+      <onentry>
+       <raise event="enteringS022"/>
+        </onentry>
+    </state>
+  </state>
+ 
+</state>
+
+<state id="s1" initial="s11">
+ 
+  <transition event="enteringS122" target="pass"/>
+  <transition event="*" target="fail"/>
+  
+  <history type="shallow" id="s1HistShallow">
+    <transition target="s11"/>
+    </history>
+  <history type="deep" id="s1HistDeep">
+    <transition target="s122"/>
+    </history>
+  <state id="s11" initial="s111">
+    <state id="s111">
+       <onentry>
+         <raise event="enteringS111"/>
+         </onentry>
+    </state>
+    <state id="s112">
+      <onentry>
+       <raise event="enteringS112"/>
+        </onentry>
+    </state>
+  </state>
+ <state id="s12" initial="s121">
+     <state id="s121">
+       <onentry>
+         <raise event="enteringS121"/>
+         </onentry>
+    </state>
+    <state id="s122">
+      <onentry>
+       <raise event="enteringS122"/>
+        </onentry>
+    </state>
+  </state>
+ 
+</state>
+
+
+<state id="s3">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+   </onentry>
+  <transition target="s0HistShallow"/>
+</state>
+
+<state id="s4">
+  <transition target="s1HistDeep"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test388.scxml b/test/samples/w3c/xpath/test388.scxml
new file mode 100644
index 0000000..87e8c53
--- /dev/null
+++ b/test/samples/w3c/xpath/test388.scxml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that history states works correctly.  The counter Var1 counts how many times
+we have entered s0.  The initial state is s012.  We then transition to s1, which transitions
+to s0's deep history state.  entering.s012 should be raised, otherwise failure.  Then we transition
+to s02, which transitions to s0's shallow history state.  That should have value s01, and its initial
+state is s011, so we should get entering.s011, otherwise failure.--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s012" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+       
+<state id="s0" initial="s01">
+  <onentry>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onentry>
+    
+  <!-- the first time through, go to s1, setting  a timer just in case something hangs -->
+  <transition event="entering.s012" cond="$Var1/text() =1" target="s1">
+     <send event="timeout" delay="2s"/>
+     </transition>
+  
+  <!-- the second time, we should get entering.s012.  If so, go to s2, otherwise fail -->
+  <transition event="entering.s012" cond="$Var1/text() =2" target="s2"/>
+    <transition event="entering" cond="$Var1/text() =2" target="fail"/>
+    
+  <!-- the third time we should get entering-s011. If so, pass, otherwise fail -->
+  <transition event="entering.s011" cond="$Var1/text() =3" target="pass"/>
+  <transition event="entering" cond="$Var1/text() =3" target="fail"/>
+ 
+ <!-- if we timeout, the state machine is hung somewhere, so fail -->
+ <transition event="timeout" target="fail"/>
+  
+  <history type="shallow" id="s0HistShallow">
+    <transition target="s02"/>
+    </history>
+  <history type="deep" id="s0HistDeep">
+    <transition target="s022"/>
+    </history>
+  <state id="s01" initial="s011">
+    <state id="s011">
+       <onentry>
+         <raise event="entering.s011"/>
+         </onentry>
+    </state>
+    <state id="s012">
+      <onentry>
+       <raise event="entering.s012"/>
+        </onentry>
+    </state>
+  </state>
+ <state id="s02" initial="s021">
+     <state id="s021">
+       <onentry>
+         <raise event="entering.s021"/>
+         </onentry>
+    </state>
+    <state id="s022">
+      <onentry>
+       <raise event="entering.s022"/>
+        </onentry>
+    </state>
+  </state>
+ 
+</state>
+
+
+<state id="s1">
+  <transition target="s0HistDeep"/>
+</state>
+
+<state id="s2">
+  <transition target="s0HistShallow"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test396.scxml b/test/samples/w3c/xpath/test396.scxml
new file mode 100644
index 0000000..aa94936
--- /dev/null
+++ b/test/samples/w3c/xpath/test396.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the value in _event.name matches the event name used to match against transitions  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+       
+<state id="s0">
+  <onentry>
+    <raise event="foo"/>
+    </onentry>
+
+    
+  <transition event="foo" cond="$_event/name = 'foo'" target="pass"/>
+  <transition event="foo" target="fail"/>
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test399.scxml b/test/samples/w3c/xpath/test399.scxml
new file mode 100644
index 0000000..922527f
--- /dev/null
+++ b/test/samples/w3c/xpath/test399.scxml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the event name matching works correctly, including prefix matching and the fact
+that the event attribute of transition may contain multiple event designators.    --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+       
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    
+  <!-- this will catch the failure case -->
+  <transition event="timeout" target="fail"/>
+  
+  <state id="s01">
+  <onentry>
+    <raise event="foo"/>
+    </onentry>
+  <!-- test that an event can match against a transition with multiple descriptors -->  
+  <transition event="foo bar" target="s02"/>
+  </state>
+  
+ <state id="s02">
+  <onentry>
+    <raise event="bar"/>
+    </onentry>
+  <!-- test that an event can match the second descriptor as well -->  
+  <transition event="foo bar" target="s03"/>
+  </state>
+
+  <state id="s03">
+  <onentry>
+    <raise event="foo.zoo"/>
+    </onentry>
+  <!-- test that a prefix descriptor matches -->  
+  <transition event="foo bar" target="s04"/>
+  </state>
+
+<state id="s04">
+  <onentry>
+    <raise event="foos"/>
+    </onentry>
+  <!-- test that only token prefixes match -->  
+  <transition event="foo" target="fail"/>
+  <transition event="foos" target="s05"/>
+</state>
+
+<state id="s05">
+  <onentry>
+    <raise event="foo.zoo"/>
+    </onentry>
+  <!-- test that .* works at the end of a descriptor -->  
+  <transition event="foo.*" target="s06"/>
+  </state>  
+
+  <state id="s06">
+  <onentry>
+    <raise event="foo"/>
+    </onentry>
+  <!-- test that "*" works by itself -->  
+  <transition event="*" target="pass"/>
+  </state>
+  
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test401.scxml b/test/samples/w3c/xpath/test401.scxml
new file mode 100644
index 0000000..7900490
--- /dev/null
+++ b/test/samples/w3c/xpath/test401.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that errors go in the internal event queue.  We send ourselves an external event foo, then perform
+and operation that raises an error. Then check that the error event is processed first, even though
+it was raised second  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+       
+<state id="s0">
+  <onentry>
+     <send event="foo"/>
+     <!-- assigning to a non-existent location should raise an error -->
+    <assign location="$Var1" expr="2"/>
+    </onentry>
+
+    
+  <transition event="foo" target="fail"/>
+  <transition event="error" target="pass"/>
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test402.scxml b/test/samples/w3c/xpath/test402.scxml
new file mode 100644
index 0000000..4a822c8
--- /dev/null
+++ b/test/samples/w3c/xpath/test402.scxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- the assertion that errors are 'like any other event' is pretty broad, but we can check that they
+are pulled off the internal queue in order, and that prefix matching works on them.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+       
+<state id="s0" initial="s01">
+  <onentry>
+     <!-- catch the failure case -->
+     <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="timeout" target="fail"/>
+
+ <state id="s01">
+   <onentry>
+   <!-- the first internal event.  The error will be the second, and event2 will be the third -->
+      <raise event="event1"/>
+     <!-- assigning to a non-existent location should raise an error -->
+    <assign location="$Var1" expr="2"/> 
+   </onentry>
+       
+  <transition event="event1" target="s02">
+    <raise event="event2"/>
+    </transition>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+<state id="s02">
+  <transition event="error" target="s03"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+<state id="s03">
+  <transition event="event2" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test403a.scxml b/test/samples/w3c/xpath/test403a.scxml
new file mode 100644
index 0000000..98b885e
--- /dev/null
+++ b/test/samples/w3c/xpath/test403a.scxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test one part of 'optimal enablement' meaning that of all transitions that are enabled, we chose the ones
+in child states over parent states, and use document order to break ties. We have
+a parent state s0 with two children, s01 and s02. In s01, we test that a) if
+a transition in the child matches, we don't consider matches in the parent and b)
+that if two transitions match in any state, we take the first in document order.
+In s02 we test that we take a transition in the parent if there is no
+matching transition in the child. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+       
+<state id="s0" initial="s01">
+  <onentry>
+     <!-- catch the failure case -->
+     <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="timeout" target="fail"/>
+  <transition event="event1" target="fail"/>
+  <transition event="event2" target="pass"/>
+
+ <state id="s01">
+   <onentry>
+   <!-- this should be caught by the first transition in this state, taking us to S02 -->
+      <raise event="event1"/>
+   </onentry>
+       
+  <transition event="event1" target="s02"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+<state id="s02">
+  <onentry>
+  <!-- since the local transition has a cond that evaluates to false this should be caught by a 
+    transition in the parent state, taking us to pass -->
+    <raise event="event2"/>
+    </onentry>
+  <transition event="event1" target="fail"/>
+  <transition event="event2" cond="0&gt;1" target="fail"/>
+  </state>
+
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test403b.scxml b/test/samples/w3c/xpath/test403b.scxml
new file mode 100644
index 0000000..657e6c6
--- /dev/null
+++ b/test/samples/w3c/xpath/test403b.scxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that 'optimally enabled set' really is a set, specifically that if a transition is optimally enabled in
+two different states, it is taken only once.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+   <data id="Var1" expr="0"/>
+   </datamodel>
+   
+<state id="s0" initial="p0">
+  <!-- this transition should never be taken because a transition in a lower state should
+  always be selected -->
+  <transition event="event1">
+    <assign location="$Var1" expr="$Var1 + 1"/>
+      </transition>
+   
+     
+   
+ <parallel id="p0">
+
+  <onentry>
+     <raise event="event1"/>
+     <raise event="event2"/>
+    </onentry>
+    
+    <!-- this transition will be selected by both states p0s1 and p0s2, but should be executed only once -->
+    <transition event="event1">
+      <assign location="$Var1" expr="$Var1 + 1"/>
+      </transition>
+      
+ <state id="p0s1">
+   <transition event="event2" cond="$Var1/text() =1" target="pass"/>
+   <transition event="event2" target="fail"/>
+   </state>
+   
+ <state id="p0s2"/>  
+ 
+</parallel>
+</state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test403c.scxml b/test/samples/w3c/xpath/test403c.scxml
new file mode 100644
index 0000000..4c7f154
--- /dev/null
+++ b/test/samples/w3c/xpath/test403c.scxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test 'optimally enabled set', specifically that preemption works correctly --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+   <data id="Var1" expr="0"/>
+   </datamodel>
+   
+<state id="s0" initial="p0">
+  <onentry>
+     <raise event="event1"/>
+     <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="event2" target="fail"/>   
+  <transition event="timeout" target="fail"/>
+   
+ <parallel id="p0">
+ 	
+ 	<state id="p0s1">
+ 		<transition event="event1"/>
+ 		<transition event="event2"/>
+ 		</state>
+ 
+ <state id="p0s2">
+   <transition event="event1" target="p0s1">
+     <raise event="event2"/>
+     </transition>
+     
+   </state>
+   
+ <state id="p0s3">
+   <!-- this transition should be blocked by the one in p0s2-->
+   <transition event="event1" target="fail"/>
+   <!-- this transition will preempt the one that p0s2 inherits
+   from an ancestor  -->
+   <transition event="event2" target="s1"/>
+
+   </state> 
+
+<state id="p0s4">
+	<!-- this transition never gets preempted, should fire twice -->
+	<transition event="*">
+		<assign location="$Var1" expr="$Var1 + 1"/>
+		</transition>
+	</state> 
+ 
+</parallel>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1/text() =2" target="pass"/>
+  <transition target="fail"/>
+  </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test404.scxml b/test/samples/w3c/xpath/test404.scxml
new file mode 100644
index 0000000..f27c0ae
--- /dev/null
+++ b/test/samples/w3c/xpath/test404.scxml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that states are exited in exit order (children before parents with reverse doc order used to break ties
+ before the executable content in the transitions.  event1, event2, event3, event4 should be raised in that 
+ order when s01p is exited  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+       
+<state id="s0" initial="s01p">
+ 
+
+
+<parallel id="s01p">
+  <onexit>
+   <!-- this should be the 3rd event raised -->
+   <raise event="event3"/>
+   </onexit>
+   <transition target="s02">
+   <!-- this should be the fourth event raised -->
+   <raise event="event4"/>
+   </transition>
+   
+ <state id="s01p1">
+   <onexit>
+   <!-- this should be the second event raised -->
+      <raise event="event2"/>
+   </onexit>
+   </state>
+  
+  <state id="s01p2">
+    <!-- this should be the first event raised -->
+    <onexit>
+     <raise event="event1"/>
+     </onexit>
+    </state>
+ </parallel>
+  
+  <state id="s02">
+    <transition event="event1" target="s03"/>
+    <transition event="*" target="fail"/>
+    </state>
+    
+  <state id="s03">
+    <transition event="event2" target="s04"/>
+    <transition event="*" target="fail"/>
+    </state>
+
+  <state id="s04">
+    <transition event="event3" target="s05"/>
+    <transition event="*" target="fail"/>
+    </state>
+    
+  <state id="s05">
+    <transition event="event4" target="pass"/>
+    <transition event="*" target="fail"/>
+    </state>
+   
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test405.scxml b/test/samples/w3c/xpath/test405.scxml
new file mode 100644
index 0000000..16e30ca
--- /dev/null
+++ b/test/samples/w3c/xpath/test405.scxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that the executable content in the transitions is executed in document order after 
+the states are exited. event1, event2, event3, event4 should be raised in that order when the
+state machine is entered  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+    
+<state id="s0" initial="s01p">
+ <onentry>
+  <send event="timeout" delay="1s"/>
+  </onentry>
+  <transition event="timeout" target="fail"/>
+
+<parallel id="s01p">
+  <transition event="event1" target="s02"/>
+
+   
+ <state id="s01p1" initial="s01p11">
+    <state id="s01p11">
+      <onexit>
+       <!-- this should be the second event raised -->
+       <raise event="event2"/>
+       </onexit>
+      <transition target="s01p12">
+        <!-- this should be the third event raised -->
+        <raise event="event3"/>
+        </transition>
+   </state>
+    <state id="s01p12"/>
+ </state>  <!-- end s01p1 -->
+ 
+ <state id="s01p2" initial="s01p21">
+    <state id="s01p21">
+      <onexit>
+       <!-- this should be the first event raised -->
+       <raise event="event1"/>
+       </onexit>
+      <transition target="s01p22">
+        <!-- this should be the fourth event raised -->
+        <raise event="event4"/>
+        </transition>
+   </state>
+    <state id="s01p22"/>
+    
+ </state>  <!-- end s01p2 -->
+ </parallel> 
+
+  
+  <state id="s02">
+    <transition event="event2" target="s03"/>
+    <transition event="*" target="fail"/>
+    </state>
+    
+  <state id="s03">
+    <transition event="event3" target="s04"/>
+    <transition event="*" target="fail"/>
+    </state>
+
+    
+  <state id="s04">
+    <transition event="event4" target="pass"/>
+    <transition event="*" target="fail"/>
+    </state>
+   
+ </state>  <!-- end s01 -->
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test406.scxml b/test/samples/w3c/xpath/test406.scxml
new file mode 100644
index 0000000..3466313
--- /dev/null
+++ b/test/samples/w3c/xpath/test406.scxml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  Test that states are entered in entry order (parents before children with document order used to break ties)
+after the executable content in the transition is executed. event1, event2, event3, event4 should be raised in that 
+order when the transition in s01 is taken  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s0" datamodel="xpath">
+    
+<state id="s0" initial="s01">
+ <onentry>
+  <send event="timeout" delay="1s"/>
+  </onentry>
+  <transition event="timeout" target="fail"/>
+  
+  <state id="s01">
+    <transition target="s0p2">
+     <!-- this should be the first event raised -->
+     <raise event="event1"/>
+     </transition>
+    </state>
+
+<parallel id="s0p2">
+ 
+  <transition event="event1" target="s03"/>
+   
+ <state id="s01p21">
+   <onentry>
+     <!-- third event -->
+     <raise event="event3"/>
+     </onentry>     
+   </state>
+   
+  <state id="s01p22">
+   <onentry>
+   <!-- the fourth event -->
+   <raise event="event4"/>
+   </onentry>
+  </state>
+  
+  <onentry>
+    <!-- this should be the second event raised -->
+    <raise event="event2"/>
+    </onentry>
+  </parallel> 
+
+  
+  <state id="s03">
+    <transition event="event2" target="s04"/>
+    <transition event="*" target="fail"/>
+    </state>
+    
+  <state id="s04">
+    <transition event="event3" target="s05"/>
+    <transition event="*" target="fail"/>
+    </state>
+
+    
+  <state id="s05">
+    <transition event="event4" target="pass"/>
+    <transition event="*" target="fail"/>
+    </state>
+   
+ </state>  <!-- end s0 -->
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test407.scxml b/test/samples/w3c/xpath/test407.scxml
new file mode 100644
index 0000000..c96630c
--- /dev/null
+++ b/test/samples/w3c/xpath/test407.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- a simple test that onexit handlers work. var1 should be incremented when we leave s0 --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+ <data id="Var1" expr="0"/>
+ </datamodel>
+       
+<state id="s0">
+  <onexit>
+     <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+  <transition target="s1"/>
+</state>
+
+<state id="s1">
+  <transition cond="$Var1/text() =1" target="pass"/>
+  <transition target="fail"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test409.scxml b/test/samples/w3c/xpath/test409.scxml
new file mode 100644
index 0000000..2d5a63d
--- /dev/null
+++ b/test/samples/w3c/xpath/test409.scxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that states are removed from the active states list as they are exited.  When s01's onexit handler
+fires, s011 should not be on the active state list, so in(S011) should be false, and event1 should not
+be raised.  Therefore the timeout should fire to indicate success   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+  
+  <transition event="timeout" target="pass"/> 
+  <transition event="event1" target="fail"/>
+  
+  <state id="s01" initial="s011">
+    <onexit>
+     <if cond="In('s011')">
+       <raise event="event1"/>
+       </if>
+       </onexit>
+       
+    <state id="s011">
+      <transition target="s02"/>
+      </state>
+  </state> <!-- end s01 -->
+
+<state id="s02"/>
+
+</state> <!-- end s0 -->
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test411.scxml b/test/samples/w3c/xpath/test411.scxml
new file mode 100644
index 0000000..60a8460
--- /dev/null
+++ b/test/samples/w3c/xpath/test411.scxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that states are added to the active states list as they are entered and before onentry handlers
+are executed.  When s0's onentry handler fires we should not be in s01.  But when s01's onentry handler
+fires, we should be in s01.  Therefore event1 should not fire, but event2 should.  Either event1 or
+timeout also indicates failure  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    <if cond="In('s01')">
+      <raise event="event1"/>
+      </if>
+    </onentry>
+  
+  <transition event="timeout" target="fail"/> 
+  <transition event="event1" target="fail"/>
+  <transition event="event2" target="pass"/>
+  
+  <state id="s01">
+    <onentry>
+     <if cond="In('s01')">
+       <raise event="event2"/>
+       </if>
+       </onentry>
+  </state> 
+
+</state> <!-- end s0 -->
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test412.scxml b/test/samples/w3c/xpath/test412.scxml
new file mode 100644
index 0000000..1895c9f
--- /dev/null
+++ b/test/samples/w3c/xpath/test412.scxml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that executable content in the <initial> transition executes after the onentry handler on the state
+and before the onentry handler of the child states.  Event1, event2, and event3 should occur in that order. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+  
+  <transition event="timeout" target="fail"/> 
+  <transition event="event1" target="fail"/>
+  <transition event="event2" target="pass"/>
+  
+  <state id="s01">
+    <onentry>
+      <raise event="event1"/>
+       </onentry>
+     <initial>
+       <transition target="s011">
+         <raise event="event2"/>
+         </transition>
+      </initial>
+      
+   <state id="s011">
+     <onentry>
+       <raise event="event3"/>
+       </onentry>
+    <transition target="s02"/>
+  </state> 
+ </state>
+ 
+<state id="s02">
+  <transition event="event1" target="s03"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+<state id="s03">
+  <transition event="event2" target="s04"/>
+  <transition event="*" target="fail"/>
+  </state>
+
+<state id="s04">
+  <transition event="event3" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+</state> <!-- end s0 -->
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test413.scxml b/test/samples/w3c/xpath/test413.scxml
new file mode 100644
index 0000000..819dfb5
--- /dev/null
+++ b/test/samples/w3c/xpath/test413.scxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the state machine is put into the configuration specified by the initial element, without regard
+to any other defaults.  we should start off in s2p111 and s2p122.  the atomic
+states we should not enter all have immediate transitions to failure in them --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s2p112 s2p122" version="1.0" datamodel="xpath">
+
+ <state id="s1">
+   <transition target="fail"/>
+   </state>
+       
+<state id="s2" initial="s2p1">
+
+<parallel id="s2p1">
+  <!-- this transition will be triggered only if we end up in an illegal configuration where we're in
+  either s2p112 or s2p122, but not both of them -->
+  <transition target="fail"/>
+  
+  <state id="s2p11" initial="s2p111">
+    <state id="s2p111">
+      <transition target="fail"/>
+    </state>
+    
+    <state id="s2p112">
+      <transition cond="In('s2p122')" target="pass"/>
+      </state>
+
+  </state> <!-- end s2p11 -->
+  
+  <state id="s2p12" initial="s2p121">
+    <state id="s2p121">
+       <transition target="fail"/>
+     </state>
+    
+    <state id="s2p122">
+      <transition cond="In('s2p112')" target="pass"/>
+    </state>
+  </state>
+  
+</parallel>
+
+</state>  <!-- end s2 -->
+ 
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test416.scxml b/test/samples/w3c/xpath/test416.scxml
new file mode 100644
index 0000000..dfa60fe
--- /dev/null
+++ b/test/samples/w3c/xpath/test416.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the done.state.id gets generated when we enter the final state of a compound state --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="xpath">
+
+ <state id="s1" initial="s11">
+   <onentry>
+     <send event="timeout" delay="1s"/>
+     </onentry>
+   <transition event="timeout" target="fail"/>
+   
+   <state id="s11" initial="s111">
+     <transition event="done.state.s11" target="pass"/>
+     <state id="s111">
+       <transition target="s11final"/>
+       </state>
+     <final id="s11final"/>
+   </state>
+ </state>      
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test417.scxml b/test/samples/w3c/xpath/test417.scxml
new file mode 100644
index 0000000..d8e5715
--- /dev/null
+++ b/test/samples/w3c/xpath/test417.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that we get the done.state.id event when all of a 
+parallel elements children enter final states.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="xpath">
+
+ <state id="s1" initial="s1p1">
+   <onentry>
+     <send event="timeout" delay="1s"/>
+     </onentry>
+   <transition event="timeout" target="fail"/>
+
+  <parallel id="s1p1">
+     <transition event="done.state.s1p1" target="pass"/>
+     
+     <state id="s1p11" initial="s1p111">
+        <state id="s1p111">
+         <transition target="s1p11final"/>
+        </state>
+        <final id="s1p11final"/>
+     </state>
+     
+     <state id="s1p12" initial="s1p121">
+       <state id="s1p121">
+         <transition target="s1p12final"/>
+       </state>
+       <final id="s1p12final"/>
+     </state>
+     
+  </parallel>
+</state> 
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test419.scxml b/test/samples/w3c/xpath/test419.scxml
new file mode 100644
index 0000000..fade57d
--- /dev/null
+++ b/test/samples/w3c/xpath/test419.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that eventless transitions take precedence over event-driven ones --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="xpath">
+
+ <state id="s1">
+   <onentry>
+     <raise event="internalEvent"/>
+     <send event="externalEvent"/>
+     </onentry>
+    
+   <transition event="*" target="fail"/>
+   <transition target="pass"/>
+
+</state> 
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test421.scxml b/test/samples/w3c/xpath/test421.scxml
new file mode 100644
index 0000000..a73a11a
--- /dev/null
+++ b/test/samples/w3c/xpath/test421.scxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that internal events take priority over external ones, and that the processor
+keeps pulling off internal events until it finds one that triggers a transition --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="xpath">
+
+ <state id="s1" initial="s11">
+   <onentry>
+      <send event="externalEvent"/>
+     <raise event="internalEvent1"/>
+     <raise event="internalEvent2"/>
+     <raise event="internalEvent3"/>
+     <raise event="internalEvent4"/>
+     </onentry>
+    
+   <transition event="externalEvent" target="fail"/>
+   
+   <state id="s11">
+     <transition event="internalEvent3" target="s12"/>
+     </state>
+     
+   <state id="s12">
+     <transition event="internalEvent4" target="pass"/>
+    </state>
+
+</state> 
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test422.scxml b/test/samples/w3c/xpath/test422.scxml
new file mode 100644
index 0000000..f62098d
--- /dev/null
+++ b/test/samples/w3c/xpath/test422.scxml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- Test that at the end of a macrostep, the processor executes all invokes in states
+that have been entered and not exited during the step.  (The invokes are supposed to be executed
+in document order, but we can test that since each invocation is separate and they may take
+different amounts to time to start up.)  In this case, there are three invoke statements,
+in states s1, s11 and s12.  Each invoked process returns an event named after its parent state.
+The invokes in s1 and s12 should execute, but not the one
+in s11. So we should receive invokeS1, invokeS12, but not invokeS12.  Furthermore, when the timeout fires, var1 should equal 2.--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" initial="s1" datamodel="xpath">
+<datamodel>
+	 <data id="Var1" expr="0"/>
+	</datamodel>
+ <state id="s1" initial="s11">
+ 	 <onentry>
+ 	 	<send event="timeout" delay="5s"/>
+ 	 	</onentry>
+ 	   <transition event="invokeS1 invokeS12">
+ 	   	<assign location="$Var1" expr="$Var1 + 1"/>
+ 	   	</transition>
+ 	   	<transition event="invokeS11" target="fail"/>
+ 	  
+ 	  <transition event="timeout" cond="$Var1/text() =2" target="pass"/>
+ 	  <transition event="timeout" target="fail"/>
+     <invoke>
+     	  <content>
+        <!-- when invoked, send 'foo' to parent, then terminate.   -->
+          <scxml initial="sub0" version="1.0" datamodel="xpath">
+            <state id="sub0">
+            	 <onentry>
+                <send target="#_parent" event="invokeS1"/>
+               </onentry>
+                <transition target="subFinal0"/>
+              </state>
+           <final id="subFinal0"/>
+        </scxml>
+      </content>
+     	 </invoke>
+     
+   <state id="s11">
+   	<invoke>
+   		    	  <content>
+        <!-- when invoked, send 'foo' to parent, then terminate.   -->
+          <scxml initial="sub1" version="1.0" datamodel="xpath">
+            <state id="sub1">
+           	 <onentry>
+                <send target="#_parent" event="invokeS11"/>
+               </onentry>
+                <transition target="subFinal1"/>
+              </state>
+           <final id="subFinal1"/>
+            </scxml>
+      </content>
+      </invoke>
+   	  <transition target="s12"/>
+   	</state>
+  <state id="s12">
+  	<invoke>
+     <content>
+        <!-- when invoked, send 'foo' to parent, then terminate.   -->
+          <scxml initial="sub2" version="1.0" datamodel="xpath">
+            <state id="sub2">
+            	 <onentry>
+                <send target="#_parent" event="invokeS12"/>
+               </onentry>
+                <transition target="subFinal2"/>
+              </state>
+           <final id="subFinal2"/>
+            </scxml>
+      </content>
+  		</invoke>
+  	</state>
+ </state>
+     
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test423.scxml b/test/samples/w3c/xpath/test423.scxml
new file mode 100644
index 0000000..7726963
--- /dev/null
+++ b/test/samples/w3c/xpath/test423.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that we keep pulling external events off the queue till we find one that matches a transition. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+ <state id="s0">
+  <onentry>
+    <send event="externalEvent1"/>
+    <send event="externalEvent2" delay="1s"/>
+    <raise event="internalEvent"/>
+    </onentry>
+    <!-- in this state we should process only internalEvent -->
+   <transition event="internalEvent" target="s1"/>
+    <transition event="*" target="fail"/>
+   </state>
+   
+ <state id="s1">
+ <!-- in this state we ignore externalEvent1 and wait for externalEvent2 -->
+   <transition event="externalEvent2" target="pass"/>
+   <transition event="internalEvent" target="fail"/>
+   </state>  
+   
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test436.scxml b/test/samples/w3c/xpath/test436.scxml
new file mode 100644
index 0000000..d8b2ca2
--- /dev/null
+++ b/test/samples/w3c/xpath/test436.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that in() predicate works in null data model --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="null" version="1.0" initial="p">
+
+     
+ <parallel id="p">
+ 
+   <state id="ps0">
+   <transition cond="In('s1')" target="fail"/>
+   <transition cond="In('ps1')" target="pass"/> 
+   <transition target="fail"/>
+   </state>
+
+   <state id="ps1"/> 
+ </parallel>
+ 
+ <state id="s1"/>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test444.scxml b/test/samples/w3c/xpath/test444.scxml
new file mode 100644
index 0000000..c689674
--- /dev/null
+++ b/test/samples/w3c/xpath/test444.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that <data> creates a new ecmascript variable. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+  <datamodel>
+    <data id="var1" expr="1"/>
+    </datamodel>
+     
+<state id="s0">
+<!-- test that var1 can be used as an ecmascript variable -->
+  <transition cond="++var1==2" target="pass"/>
+  <transition target="fail"/>
+</state>
+
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test445.scxml b/test/samples/w3c/xpath/test445.scxml
new file mode 100644
index 0000000..f1ae24b
--- /dev/null
+++ b/test/samples/w3c/xpath/test445.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that ecmascript objects defined by <data> have value undefined if <data> does not assign a value --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+  <datamodel>
+    <data id="var1"/>
+    </datamodel>
+     
+<state id="s0">
+
+  <transition cond="var1==undefined" target="pass"/>
+  <transition target="fail"/>
+</state>
+
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test448.scxml b/test/samples/w3c/xpath/test448.scxml
new file mode 100644
index 0000000..adbc121
--- /dev/null
+++ b/test/samples/w3c/xpath/test448.scxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that all ecmascript objects are placed in a single global scope --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+ 
+     
+<state id="s0">
+<!-- test that a parent state can access a variable defined in a child -->
+  <transition cond="var1==1" target="s1"/>
+  <transition target="fail"/>
+   <state id="s01">
+    <datamodel>
+      <data id="var1" expr="1"/>
+       </datamodel>
+    </state>
+ </state>  
+    <state id="s1" initial="s01p">  
+     <parallel id="s01p">
+       <state id="s01p1">
+  <!-- test that we can access a variable defined in a parallel sibling state -->
+           <transition cond="var2==1" target="pass"/>
+           <transition target="fail"/>
+       </state>
+       <state id="s01p2">
+           <datamodel>
+           <data id="var2" expr="1"/>
+          </datamodel>
+       </state>
+     </parallel>
+    </state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test449.scxml b/test/samples/w3c/xpath/test449.scxml
new file mode 100644
index 0000000..d06cc9a
--- /dev/null
+++ b/test/samples/w3c/xpath/test449.scxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that ecmascript objects are converted to booleans inside cond --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+ 
+     
+<state id="s0">
+  <transition cond="'foo'" target="pass"/>
+  <transition target="fail"/>
+    </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test451.scxml b/test/samples/w3c/xpath/test451.scxml
new file mode 100644
index 0000000..e939ded
--- /dev/null
+++ b/test/samples/w3c/xpath/test451.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- simple test of the in() predicate --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="ecmascript" initial="p">
+
+     
+ <parallel id="p">
+ 
+   <state id="s0">
+   <transition cond="In('s1')" target="pass"/> 
+   <transition target="fail"/>
+   </state>
+
+   <state id="s1"/> 
+ </parallel>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+   
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test452.scxml b/test/samples/w3c/xpath/test452.scxml
new file mode 100644
index 0000000..4f38ca7
--- /dev/null
+++ b/test/samples/w3c/xpath/test452.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that we can assign to any location in the datamodel. In this case, we just test that we can assign
+to a substructure (not the top level variable).  This may not be the most idiomatic way to write the test --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+ <datamodel>
+   <data id="foo" expr="0"/>
+   </datamodel>
+    <script>
+    function testobject() {
+    this.bar = 0;}
+   </script>    
+<state id="s0">
+ <onentry>
+   <assign location="foo" expr="new testobject();"/>
+<!-- try to assign to foo's bar property -->
+   <assign location="foo.bar" expr="1"/>
+   <raise event="event1"/>
+   </onentry>
+<!-- test that we have assigned to foo's bar property -->  
+   <transition event="event1" cond="foo.bar == 1" target="pass"/>
+   <transition event="*" target="fail"/>
+    </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test453.scxml b/test/samples/w3c/xpath/test453.scxml
new file mode 100644
index 0000000..33b904d
--- /dev/null
+++ b/test/samples/w3c/xpath/test453.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that we can use any ecmascript expression as a value expression. 
+In this case, we just test that we can assign
+a function to a variable and then call it.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+ <datamodel>
+   <data id="var1" expr="function(invar) {return invar + 1;}"/>
+   </datamodel>
+
+<state id="s0">
+  <onentry>
+   <raise event="event1"/>
+   </onentry>
+<!-- test that we can call the function -->  
+   <transition event="event1" cond="var1(2) == 3" target="pass"/>
+   <transition event="*" target="fail"/>
+    </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test456.scxml b/test/samples/w3c/xpath/test456.scxml
new file mode 100644
index 0000000..2aebab0
--- /dev/null
+++ b/test/samples/w3c/xpath/test456.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we can't test that _any_ ecmascript is valid inside <script>, so we
+just run a simple one and check that it can update the data model. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  </datamodel>
+  
+ <state id="s0">
+  <onentry>
+    <script>
+      Var1+=1
+      </script>
+   </onentry> 
+   <transition cond="$Var1/text() =1" target="pass"/>
+   <transition target="fail"/>
+   </state>
+   
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test457.scxml b/test/samples/w3c/xpath/test457.scxml
new file mode 100644
index 0000000..86cf156
--- /dev/null
+++ b/test/samples/w3c/xpath/test457.scxml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an the legal iterable collections are arrays, namely objects that satisfy instanceof(Array) in ECMAScript.
+ 	     the legal values for the 'item' attribute on foreach are legal ECMAScript variable names.. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0">
+<datamodel>
+  <data id="Var1" expr="0"/>
+  <data id="Var2"/>
+  <data id="Var3"/>
+  <data id="Var4" expr="7"/>
+  <data id="Var5" expr="[1,2,3]"/>
+  <data id="Var6"/>
+  </datamodel>
+  
+   <state id="s0">
+      <onentry>
+<!-- invalid array, legal item -->
+        <foreach item="Var2" index="Var3" array="Var4">
+          <assign location="Var1" expr="Var1 + 1"/>
+          </foreach>
+        <raise event="foo"/>
+        </onentry>
+   <transition event="error.execution" target="s1"/>
+   <transition event="*" target="fail"/> 
+   </state>
+   
+   <state id="s1">
+      <onentry>
+<!-- illegal item, legal array -->
+        <foreach item="'continue'" index="Var3" array="Var5">
+          <assign location="Var1" expr="Var1 + 1"/>
+          </foreach>
+        <raise event="bar"/>
+        </onentry>
+   <transition event="error.execution" target="s2"/>
+   <transition event="bar" target="fail"/> 
+   </state>
+
+<state id="s2">
+  <!-- check that var1 has its original value (so executable content never got executed -->
+  <transition cond="Var1==0" target="s3"/>
+  <transition target="fail"/>
+  </state> 
+
+
+<!-- finally check that a legal array works properly -->
+<state id="s3">
+	<onentry>
+		<assign location="Var6" expr="0"/>
+    <foreach item="Var2" array="Var5">
+	  <assign location="Var6" expr="Var6 + Var2"/>
+	</foreach>
+	</onentry>
+	  <transition cond="Var6==6" target="pass"/>
+	  <transition target="fail"/>
+ </state>   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test460.scxml b/test/samples/w3c/xpath/test460.scxml
new file mode 100644
index 0000000..8ba3e5e
--- /dev/null
+++ b/test/samples/w3c/xpath/test460.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that <foreach> does a shallow copy, so that modifying the array does not change
+the iteration behavior. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="ecmascript" version="1.0">
+  <datamodel>
+    <data id="Var1" expr="[1,2,3]"/>
+    <data id="Var2" expr="0"/>  <!-- counts the number of iterations -->
+    </datamodel>
+     
+<state id="s0">
+  <onentry>
+  <foreach item="Var3" array="Var1">
+    <assign location="Var1" expr="[].concat(Var1, [4])"/>
+    <assign location="Var2" expr="Var2 + 1"/>
+    </foreach>
+   </onentry>
+   
+   <transition cond="Var2==3" target="pass"/>
+   <transition target="fail"/>
+</state>
+
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test463.scxml b/test/samples/w3c/xpath/test463.scxml
new file mode 100644
index 0000000..4f32b84
--- /dev/null
+++ b/test/samples/w3c/xpath/test463.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the <data> tag creates an element in the XML datamodel with the correct name and id attr
+and binds an XPath variable to it --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="foo" expr="2"/>
+  </datamodel>
+  
+<state id="s0">
+
+ 
+  <transition cond="local-name($foo)='data'and $foo/@id ='foo'" target="pass"/>
+  <transition target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test464.scxml b/test/samples/w3c/xpath/test464.scxml
new file mode 100644
index 0000000..bd640f2
--- /dev/null
+++ b/test/samples/w3c/xpath/test464.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an unassigned variable creates an empty <data> element --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="foo"/>
+  </datamodel>
+  
+<state id="s0">
+
+ 
+  <transition cond="count($foo) = 1 and count($foo/*) = 0" target="pass"/>
+  <transition target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test465.scxml b/test/samples/w3c/xpath/test465.scxml
new file mode 100644
index 0000000..a91bb06
--- /dev/null
+++ b/test/samples/w3c/xpath/test465.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that all xpath variables are in a single global scope--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="foo" expr="2"/>
+  </datamodel>
+  
+<state id="s0">
+ <transition cond="count($foo) = 1 and count($bar) = 1" target="s1"/>
+  <transition target="fail"/> 
+  </state>
+  
+
+<state id="s1">
+ <datamodel>
+   <data id="bar" expr="1"/>
+   </datamodel>
+   <transition target="pass"/>
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test466.scxml b/test/samples/w3c/xpath/test466.scxml
new file mode 100644
index 0000000..1431fab
--- /dev/null
+++ b/test/samples/w3c/xpath/test466.scxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that xpath expressions are converted to boolean when used as conditional expressions--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="foo" expr="2"/>
+  </datamodel>
+  
+<state id="s0">
+ <transition cond="$foo" target="pass"/>
+  <transition target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test467.scxml b/test/samples/w3c/xpath/test467.scxml
new file mode 100644
index 0000000..130b7bc
--- /dev/null
+++ b/test/samples/w3c/xpath/test467.scxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that in() is available --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+ <transition cond="In('s0')" target="pass"/>
+  <transition target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test468.scxml b/test/samples/w3c/xpath/test468.scxml
new file mode 100644
index 0000000..3b6902d
--- /dev/null
+++ b/test/samples/w3c/xpath/test468.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that XPath expressions can be used as location expressions.
+ This example is taken from the spec --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="cities">
+      <list xmlns="">
+        <city id="nyc" count="0">New York</city>
+        <city id="bos" count="0">Boston</city>
+      </list>
+    </data>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+    <assign location="$cities/list/city[@id='nyc']/@count" expr="1"/>
+  </onentry>
+   <transition cond="$cities/list/city[@id='nyc']/@count = 1" target="pass"/>
+   <transition target="fail"/> 
+  </state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test469.scxml b/test/samples/w3c/xpath/test469.scxml
new file mode 100644
index 0000000..02fe476
--- /dev/null
+++ b/test/samples/w3c/xpath/test469.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that XPath expressions can be used as value expressions. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="copyOfEventData"/>  
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+    <send event="event1">
+      <param name="param1" expr="1"/>
+      </send>
+  </onentry>
+   <transition event="event1" target="s1">
+     <assign location="$copyOfEventData" expr="$_event/data"/>
+     </transition>
+  </state>
+  
+<state id="s1">
+   <transition cond="$copyOfEventData/data/data[@id='param1'] =1" target="pass"/>
+  <transition target="fail"/>
+  </state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test470.scxml b/test/samples/w3c/xpath/test470.scxml
new file mode 100644
index 0000000..3c26bb1
--- /dev/null
+++ b/test/samples/w3c/xpath/test470.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the processor makes a deep copy of a node set when assigning. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="var1">
+    <foo xmlns="">
+      <bar>2</bar>
+      </foo>
+      </data>
+   <data id="var2"/>  
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+    <assign location="$var2" expr="$var1/foo"/>
+    <assign location="$var1/foo/bar" expr="3"/>
+  </onentry>
+   <transition cond="$var2/foo/bar=2" target="pass"/>
+   <transition target="fail"/>
+  </state>
+  
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test473.scxml b/test/samples/w3c/xpath/test473.scxml
new file mode 100644
index 0000000..4a57129
--- /dev/null
+++ b/test/samples/w3c/xpath/test473.scxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'replacechildren' in <assign> replaces all children with the new value.
+ This example is taken from the doc --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]">
+  <bookinfo xmlns="">
+    <isdn>12334455</isdn>
+    <author>some author</author>
+  </bookinfo>
+</assign>
+  </onentry>
+   <transition cond="$cart/myCart/books/book[1]/bookinfo/isdn/text() = '12334455'     and not($cart/myCart/books/book[1]/title)" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test474.scxml b/test/samples/w3c/xpath/test474.scxml
new file mode 100644
index 0000000..decad75
--- /dev/null
+++ b/test/samples/w3c/xpath/test474.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'firstchild' in <assign> inserts the new value before the other children. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]" type="firstchild">
+  <bookinfo xmlns="">
+    <isdn>12334455</isdn>
+    <author>some author</author>
+  </bookinfo>
+</assign>
+  </onentry>
+   <transition cond="$cart/myCart/books/book[1]/*[1]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[2]/text() = 'The Zen Mind'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test475.scxml b/test/samples/w3c/xpath/test475.scxml
new file mode 100644
index 0000000..0f9cdfe
--- /dev/null
+++ b/test/samples/w3c/xpath/test475.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'lastchild' in <assign> inserts the new value after the other children. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]" type="lastchild">
+  <bookinfo xmlns="">
+    <isdn>12334455</isdn>
+    <author>some author</author>
+  </bookinfo>
+</assign>
+  </onentry>
+   <transition cond="$cart/myCart/books/book[1]/*[2]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[1]/text() = 'The Zen Mind'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test476.scxml b/test/samples/w3c/xpath/test476.scxml
new file mode 100644
index 0000000..d3fe8e8
--- /dev/null
+++ b/test/samples/w3c/xpath/test476.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'nextsibling' in <assign> inserts the new value after the location. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]/title" type="nextsibling">
+  <bookinfo xmlns="">
+    <isdn>12334455</isdn>
+    <author>some author</author>
+  </bookinfo>
+</assign>
+  </onentry>
+   <transition cond="$cart/myCart/books/book[1]/*[2]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[1]/text() = 'The Zen Mind'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test477.scxml b/test/samples/w3c/xpath/test477.scxml
new file mode 100644
index 0000000..1726866
--- /dev/null
+++ b/test/samples/w3c/xpath/test477.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'previoussibling' in <assign> inserts the new value before the location. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]/title" type="previoussibling">
+  <bookinfo xmlns="">
+    <isdn>12334455</isdn>
+    <author>some author</author>
+  </bookinfo>
+</assign>
+  </onentry>
+   <transition cond="$cart/myCart/books/book[1]/*[1]/isdn/text() = '12334455'    and $cart/myCart/books/book[1]/*[2]/text() = 'The Zen Mind'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test478.scxml b/test/samples/w3c/xpath/test478.scxml
new file mode 100644
index 0000000..9821608
--- /dev/null
+++ b/test/samples/w3c/xpath/test478.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'replace' in <assign> replaces the value at the location. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[2]" type="replace">
+  <cd xmlns="">
+    <title>This is not a book</title>
+    </cd>  
+</assign>
+  </onentry>
+  
+   <transition cond="$cart/myCart/books/cd/title = 'This is not a book'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test479.scxml b/test/samples/w3c/xpath/test479.scxml
new file mode 100644
index 0000000..3d5b1ac
--- /dev/null
+++ b/test/samples/w3c/xpath/test479.scxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'delete' in <assign> deletes the value at the location. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/cds" type="delete">
+  <cd xmlns="">
+    <title>This is not a book</title>
+    </cd>  
+</assign>
+  </onentry>
+  
+   <transition cond="not($cart/myCart/cds)" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test480.scxml b/test/samples/w3c/xpath/test480.scxml
new file mode 100644
index 0000000..0fde260
--- /dev/null
+++ b/test/samples/w3c/xpath/test480.scxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that 'addattr' in <assign> adds an attribute to the specified node. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+ <assign location="$cart/myCart/books/book[1]" type="addattribute" attr="author" expr="'somebody'"/>
+   </onentry>
+  
+   <transition cond="$cart/myCart/books/book[1]/@author = 'somebody'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test481.scxml b/test/samples/w3c/xpath/test481.scxml
new file mode 100644
index 0000000..a0505f6
--- /dev/null
+++ b/test/samples/w3c/xpath/test481.scxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that illegal assignments fail and have no side effects. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+ <data id="cart">
+  <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+   </datamodel>
+  
+<state id="s0">
+  <onentry>
+   <send event="timeout" delay="3s"/>
+ <assign location="$cart/myCart/cds/cd/@name">
+  <foo>
+    <bar/>
+  </foo>
+</assign>
+   </onentry>
+  
+   <transition event="error.execution" cond="$cart/myCart/cds/cd/@name = 'Something'" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test482.scxml b/test/samples/w3c/xpath/test482.scxml
new file mode 100644
index 0000000..00eb3fe
--- /dev/null
+++ b/test/samples/w3c/xpath/test482.scxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that system vars are created and bound to XPath variables --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+ 
+  
+<state id="s0">
+  <onentry>
+  <!-- event isn't bound until an event is raised -->
+   <raise event="someevent"/>
+  </onentry>
+   <transition event="*" cond="local-name($_event) = 'data'     and local-name($_sessionid) = 'data'      and local-name($_name) = 'data'      and local-name($_ioprocessors) = 'data'" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test487.scxml b/test/samples/w3c/xpath/test487.scxml
new file mode 100644
index 0000000..9e6c441
--- /dev/null
+++ b/test/samples/w3c/xpath/test487.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test illegal assignment.  error.execution should be raised.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="!1"/>
+  </datamodel>
+     
+<state id="s0">
+  <onentry>
+   <raise event="event"/>
+   </onentry>
+   
+  <transition event="error.execution" target="pass"/>
+  <transition event="*" target="fail"/>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test488.scxml b/test/samples/w3c/xpath/test488.scxml
new file mode 100644
index 0000000..9da2e92
--- /dev/null
+++ b/test/samples/w3c/xpath/test488.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that illegal expr in <param> produces error.execution and empty event.data --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+     
+ <state id="s0" initial="s01">
+   <!-- we should get the error before the done event -->
+   <transition event="error.execution" target="s1"/>
+   <transition event="done.state.s0" target="fail"/>     
+
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <param expr="!1" name="someParam"/>
+      </donedata>
+     </final>
+  </state>
+
+ 
+ <!-- if we get here, we received the error event. Now check that the done
+ event has empty event.data -->
+ 
+ <state id="s1">
+   <transition event="done.state.s0" cond="not($_event/data/*)" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test495.scxml b/test/samples/w3c/xpath/test495.scxml
new file mode 100644
index 0000000..c244266
--- /dev/null
+++ b/test/samples/w3c/xpath/test495.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the scxml event i/o processor puts events in the correct queues.--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+    <onentry>
+   <!-- default target is external queue -->
+   <send event="event1" type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor"/>
+     <send event="event2" target="#_internal" type="http://www.w3.org/TR/scxml/#SCXMLEventProcessor"/>
+     </onentry>
+     <!-- we should get the internal event first -->
+     <transition event="event1" target="fail"/>
+     <transition event="event2" target="s1"/>
+ </state>
+    
+<state id="s1">
+   <transition event="event1" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test500.scxml b/test/samples/w3c/xpath/test500.scxml
new file mode 100644
index 0000000..51252eb
--- /dev/null
+++ b/test/samples/w3c/xpath/test500.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that location field is found inside entry for SCXML Event I/O processor --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#SCXMLProcessor&#34;]/location/text()"/>
+  </datamodel>
+  
+<state id="s0">
+  <transition cond="$Var1/* or $Var1/text()" target="pass"/>
+  <transition target="fail"/>
+   
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test501.scxml b/test/samples/w3c/xpath/test501.scxml
new file mode 100644
index 0000000..740f81b
--- /dev/null
+++ b/test/samples/w3c/xpath/test501.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the location entry for the SCXML Event I/O processor can be used as the target for an event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#SCXMLProcessor&#34;]/location/text()"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+    <send targetexpr="$Var1" event="foo"/>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+  <transition event="foo" target="pass"/>
+  <transition event="*" target="fail"/>
+   
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test503.scxml b/test/samples/w3c/xpath/test503.scxml
new file mode 100644
index 0000000..addd166
--- /dev/null
+++ b/test/samples/w3c/xpath/test503.scxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that a targetless transition does not exit and reenter its source state --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>  <!-- how often we have exited s2 -->
+  <data id="Var2" expr="0"/>  <!-- how often the targetless transition in s2 has been executed -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+   <transition target="s2"/>
+   </state>
+  
+ <state id="s2">
+   <onexit>
+   <assign location="$Var1" expr="$Var1 + 1"/>
+   </onexit>
+   <transition event="foo">
+     <assign location="$Var2" expr="$Var2 + 1"/>
+     </transition>
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" cond="$Var2/text() =1" target="s3"/>
+  <transition event="bar" target="fail"/>
+  </state>
+  
+  <state id="s3">
+  <!-- make sure that s2 was exited only once -->
+    <transition cond="$Var1/text() =1" target="pass"/>
+    <transition target="fail"/>
+    </state> 
+  
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test504.scxml b/test/samples/w3c/xpath/test504.scxml
new file mode 100644
index 0000000..08b7a2e
--- /dev/null
+++ b/test/samples/w3c/xpath/test504.scxml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an external transition exits all states up the the LCCA --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>  <!-- how often we have exited p -->
+  <data id="Var2" expr="0"/>  <!-- how often we have exited ps1 -->
+  <data id="Var3" expr="0"/>  <!-- how often we have exited ps2 -->
+  <data id="Var4" expr="0"/>  <!-- how often the transition for foo has been taken -->
+  <data id="Var5" expr="0"/>  <!-- how often we have exited s2  -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+   <transition target="p"/>
+   </state>
+   
+<state id="s2">
+	 <onexit>
+	 	<assign location="$Var5" expr="$Var5 + 1"/>
+	 	</onexit>
+
+<parallel id="p">
+  <onexit>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+  <transition event="foo" target="ps1">
+     <assign location="$Var4" expr="$Var4 + 1"/>
+     </transition>
+     
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" cond="$Var4/text() =1" target="s3"/>
+  <transition event="bar" target="fail"/>
+  
+ <state id="ps1">
+   <onexit>
+   <assign location="$Var2" expr="$Var2 + 1"/>
+   </onexit>
+  </state>
+  <state id="ps2">
+   <onexit>
+   <assign location="$Var3" expr="$Var3 + 1"/>
+   </onexit>
+  </state>
+</parallel>
+</state>
+  
+<state id="s3">
+  <!-- make sure that p was exited twice -->
+    <transition cond="$Var1/text() =2" target="s4"/>
+    <transition target="fail"/>
+ </state> 
+ 
+<state id="s4">
+  <!-- make sure that ps1 was exited twice -->
+    <transition cond="$Var2/text() =2" target="s5"/>
+    <transition target="fail"/>
+ </state> 
+  
+<state id="s5">
+  <!-- make sure that ps2 was exited twice -->
+    <transition cond="$Var3/text() =2" target="s6"/>
+    <transition target="fail"/>
+ </state>
+ 
+<state id="s6">
+	<!-- make sure that s1 was exited once -->
+	<transition cond="$Var5/text() =1" target="pass"/>
+	<transition target="fail"/>
+	</state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test505.scxml b/test/samples/w3c/xpath/test505.scxml
new file mode 100644
index 0000000..94575a1
--- /dev/null
+++ b/test/samples/w3c/xpath/test505.scxml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an internal transition does not exit its source state --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>  <!-- how often we have exited s1 -->
+  <data id="Var2" expr="0"/>  <!-- how often we have exited s11 -->
+  <data id="Var3" expr="0"/>  <!-- how often the transition for foo has been taken -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+  <onexit>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+  <transition event="foo" type="internal" target="s11">
+     <assign location="$Var3" expr="$Var3 + 1"/>
+     </transition>
+     
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" cond="$Var3/text() =1" target="s2"/>
+  <transition event="bar" target="fail"/>
+  
+ <state id="s11">
+   <onexit>
+   <assign location="$Var2" expr="$Var2 + 1"/>
+   </onexit>
+  </state>
+ </state>
+  
+<state id="s2">
+  <!-- make sure that s1 was exited once -->
+    <transition cond="$Var1/text() =1" target="s3"/>
+    <transition target="fail"/>
+ </state> 
+ 
+  
+<state id="s3">
+  <!-- make sure that s11 was exited twice -->
+    <transition cond="$Var2/text() =2" target="pass"/>
+    <transition target="fail"/>
+ </state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test506.scxml b/test/samples/w3c/xpath/test506.scxml
new file mode 100644
index 0000000..4d0fbfb
--- /dev/null
+++ b/test/samples/w3c/xpath/test506.scxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an internal transition whose targets are not proper descendants of its source state
+behaves like an external transition --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>  <!-- how often we have exited s2 -->
+  <data id="Var2" expr="0"/>  <!-- how often we have exited s21 -->
+  <data id="Var3" expr="0"/>  <!-- how often the transition for foo has been taken -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+   <transition target="s2"/>
+   </state>
+
+<state id="s2" initial="s21">
+  <onexit>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+  <transition event="foo" type="internal" target="s2">
+     <assign location="$Var3" expr="$Var3 + 1"/>
+     </transition>
+     
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" cond="$Var3/text() =1" target="s3"/>
+  <transition event="bar" target="fail"/>
+  
+ <state id="s21">
+   <onexit>
+   <assign location="$Var2" expr="$Var2 + 1"/>
+   </onexit>
+  </state>
+
+</state>
+  
+<state id="s3">
+  <!-- make sure that s2 was exited twice -->
+    <transition cond="$Var1/text() =2" target="s4"/>
+    <transition target="fail"/>
+ </state> 
+ 
+<state id="s4">
+  <!-- make sure that s21 was exited twice -->
+    <transition cond="$Var2/text() =2" target="pass"/>
+    <transition target="fail"/>
+ </state> 
+  
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test509.scxml b/test/samples/w3c/xpath/test509.scxml
new file mode 100644
index 0000000..70e903f
--- /dev/null
+++ b/test/samples/w3c/xpath/test509.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that Basic HTTP Event I/O processor uses POST method and that it can receive messages
+at the accessURI --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     </onentry>
+     <!-- if the event was send by http and we get it, we succeed -->
+    <transition event="test" cond="contains($_event/raw, 'POST')" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test510.scxml b/test/samples/w3c/xpath/test510.scxml
new file mode 100644
index 0000000..11adc1c
--- /dev/null
+++ b/test/samples/w3c/xpath/test510.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that Basic HTTP messages go into external queue.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+     <!-- this creates an internal event -->
+     <raise event="internal"/>
+  
+      </onentry>
+     <!-- we should get 'internal' first, then 'test' -->
+  <transition event="internal" target="s1"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+ <state id="s1">
+   <transition event="test" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test518.scxml b/test/samples/w3c/xpath/test518.scxml
new file mode 100644
index 0000000..c79aa5d
--- /dev/null
+++ b/test/samples/w3c/xpath/test518.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that namelist values get encoded as POST parameters.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+  <data id="Var1" expr="2"/>
+  </datamodel>
+
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" namelist="$Var1" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/>
+      </onentry>
+     
+  <transition event="test" cond="contains($_event/raw, 'Var1=2')" target="pass"/>
+  <transition event="*" target="fail"/>
+
+ </state>
+ 
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test519.scxml b/test/samples/w3c/xpath/test519.scxml
new file mode 100644
index 0000000..684098e
--- /dev/null
+++ b/test/samples/w3c/xpath/test519.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <param> values get encoded as POST parameters.  . --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <param name="param1" expr="1"/>
+       </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" cond="contains($_event/raw, '1=1')" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test520.scxml b/test/samples/w3c/xpath/test520.scxml
new file mode 100644
index 0000000..cb54284
--- /dev/null
+++ b/test/samples/w3c/xpath/test520.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <content> gets sent as the body of the message.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <content>this is some content</content>
+      </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="HTTP.POST" cond="contains($_event/raw, this is some content)" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test521.scxml b/test/samples/w3c/xpath/test521.scxml
new file mode 100644
index 0000000..4b958ea
--- /dev/null
+++ b/test/samples/w3c/xpath/test521.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the processor raises error.communication if it cannot dispatch the event.
+(To create an undispatchable event, we choose a non-existent session as target).  If it raises
+the error event, we succeed.  Otherwise we eventually timeout and fail.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- should cause an error -->
+   <send target="#_scxml_foo" event="event2"/>
+   <!-- this will get added to the external event queue after the error has been raised -->
+   <send event="timeout"/>
+    </onentry>
+ 
+ <!-- once we've entered the state, we should check for internal events first -->   
+  <transition event="error.communication" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test522.scxml b/test/samples/w3c/xpath/test522.scxml
new file mode 100644
index 0000000..a13966d
--- /dev/null
+++ b/test/samples/w3c/xpath/test522.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that location field the entry for Basic HTTP Event I/O processor can be used
+to send a message to the processor --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+  
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()"/>
+
+     </onentry>
+     <!-- the event we receive should be called 'test', but that's not actually
+     required for this test. Only that the send deliver some event to us.  So if
+     we get something other than timeout or error, we call it success -->
+  <transition event="timeout" target="fail"/>
+  <transition event="error" target="fail"/>
+  <transition event="*" target="pass"/>
+
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test525.scxml b/test/samples/w3c/xpath/test525.scxml
new file mode 100644
index 0000000..a19e06e
--- /dev/null
+++ b/test/samples/w3c/xpath/test525.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that <foreach> does a shallow copy, so that modifying the array does not change
+the iteration behavior. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" datamodel="xpath" version="1.0">
+  <datamodel>
+    <data id="Var1">
+      <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+      </data>
+    <data id="Var2" expr="0"/>  <!-- counts the number of iterations -->
+    </datamodel>
+     
+<state id="s0">
+  <onentry>
+  <foreach item="Var3" array="$Var1/*">
+    <assign type="lastchild" location="$Var1" expr="$Var1/*"/>
+    <assign location="$Var2" expr="$Var2 + 1"/>
+    </foreach>
+   </onentry>
+   
+   <transition cond="$Var2/text() =3" target="pass"/>
+   <transition target="fail"/>
+</state>
+
+
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test527.scxml b/test/samples/w3c/xpath/test527.scxml
new file mode 100644
index 0000000..a5c69f8
--- /dev/null
+++ b/test/samples/w3c/xpath/test527.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- simple test that 'expr' works with <content> --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+     
+ <state id="s0" initial="s01">
+    
+   <transition event="done.state.s0" cond="$_event/data = 'foo'" target="pass">
+     </transition>
+     
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <content expr="'foo'"/>
+      </donedata>
+     </final>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test528.scxml b/test/samples/w3c/xpath/test528.scxml
new file mode 100644
index 0000000..7cc88f7
--- /dev/null
+++ b/test/samples/w3c/xpath/test528.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!--  test that illegal 'expr' produces error.execution and empty event.data --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+     
+ <state id="s0" initial="s01">
+   <!-- we should get the error before the done event -->
+   <transition event="error.execution" target="s1"/>
+   <transition event="done.state.s0" target="fail"/>     
+
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <content expr="!1"/>
+      </donedata>
+     </final>
+  </state>
+
+ 
+ <!-- if we get here, we received the error event. Now check that the done
+ event has empty event.data -->
+ 
+ <state id="s1">
+   <transition event="done.state.s0" cond="not($_event/data/*)" target="pass"/>
+   <transition event="*" target="fail"/>
+   </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test529.scxml b/test/samples/w3c/xpath/test529.scxml
new file mode 100644
index 0000000..5a78529
--- /dev/null
+++ b/test/samples/w3c/xpath/test529.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- simple test that children workn with <content> --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" version="1.0" datamodel="xpath" initial="s0">
+
+     
+ <state id="s0" initial="s01">
+    
+   <transition event="done.state.s0" cond="$_event/data = '21'" target="pass">
+     </transition>
+     
+      <transition event="done.state.s0" target="fail">
+     </transition>
+
+   <state id="s01">
+   <transition target="s02"/>
+   </state>
+   <final id="s02">
+     <donedata>
+      <content>21</content>
+      </donedata>
+     </final>
+ </state>
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test530.scxml b/test/samples/w3c/xpath/test530.scxml
new file mode 100644
index 0000000..083ff37
--- /dev/null
+++ b/test/samples/w3c/xpath/test530.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that <content> child is evaluated when <invoke> is. Var1 is initialized
+with an integer value, then set to an scxml script in the onentry to s0.  If <content>
+is evaluated at the right time, we should get invoke.done, otherwise an error  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="Var1" expr="1"/>
+    </datamodel>
+    
+    <state id="s0">
+      <onentry>
+        <assign location="$Var1">
+           <scxml version="1.0"><final/></scxml>
+           </assign>
+        <send event="timeout" delay="2s"/>
+        </onentry>
+        
+      <invoke type="http://www.w3.org/TR/scxml/">
+        <content expr="$Var1/*"/>
+        </invoke>
+        
+        <transition event="done.invoke" target="pass"/>
+        <transition event="*" target="fail"/>
+    </state>
+    
+    <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+    <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+  </scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test531.scxml b/test/samples/w3c/xpath/test531.scxml
new file mode 100644
index 0000000..282e479
--- /dev/null
+++ b/test/samples/w3c/xpath/test531.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that the value of the <param> _scxmleventname gets used as the name
+of the raised event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+      <content>_scxmleventname=test</content>
+      </send>  
+     </onentry>
+     
+     <!-- if we get an event named 'test' we succeed. Otherwise fail -->
+  <transition event="test" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test532.scxml b/test/samples/w3c/xpath/test532.scxml
new file mode 100644
index 0000000..f883c66
--- /dev/null
+++ b/test/samples/w3c/xpath/test532.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that if _scxmleventname  is not present, the name of the HTTP method is used
+as the name of the resulting event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+    <send targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <!-- this content will be ignored, but it's here to make sure we have a message body -->
+      <content>some content</content>
+      </send>  
+     </onentry>
+     
+  <transition event="HTTP.POST" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test533.scxml b/test/samples/w3c/xpath/test533.scxml
new file mode 100644
index 0000000..06f090b
--- /dev/null
+++ b/test/samples/w3c/xpath/test533.scxml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that an internal transition whose source state is not compound does  exit its source state --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="0"/>  <!-- how often we have exited p -->
+  <data id="Var2" expr="0"/>  <!-- how often we have exited ps1 -->
+  <data id="Var3" expr="0"/>  <!-- how often we have exited ps2 -->
+  <data id="Var4" expr="0"/>  <!-- how often the transition for foo has been taken -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+   <transition target="p"/>
+   </state>
+
+<parallel id="p">
+  <onexit>
+    <assign location="$Var1" expr="$Var1 + 1"/>
+    </onexit>
+  <transition event="foo" type="internal" target="ps1">
+     <assign location="$Var4" expr="$Var4 + 1"/>
+     </transition>
+     
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" cond="$Var4/text() =1" target="s2"/>
+  <transition event="bar" target="fail"/>
+  
+ <state id="ps1">
+   <onexit>
+   <assign location="$Var2" expr="$Var2 + 1"/>
+   </onexit>
+  </state>
+  <state id="ps2">
+   <onexit>
+   <assign location="$Var3" expr="$Var3 + 1"/>
+   </onexit>
+  </state>
+</parallel>
+  
+<state id="s2">
+  <!-- make sure that p was exited twice -->
+    <transition cond="$Var1/text() =2" target="s3"/>
+    <transition target="fail"/>
+ </state> 
+ 
+<state id="s3">
+  <!-- make sure that ps1 was exited twice -->
+    <transition cond="$Var2/text() =2" target="s4"/>
+    <transition target="fail"/>
+ </state> 
+  
+<state id="s4">
+  <!-- make sure that ps2 was exited twice -->
+    <transition cond="$Var3/text() =2" target="pass"/>
+    <transition target="fail"/>
+ </state>
+  
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+     
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test534.scxml b/test/samples/w3c/xpath/test534.scxml
new file mode 100644
index 0000000..6dde647
--- /dev/null
+++ b/test/samples/w3c/xpath/test534.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that <send> 'event' value gets sent as the param _scxmleventname . --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="30s"/>
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+        </send>  
+     </onentry>
+     
+     <!-- if other end sends us back this event, we succeed -->
+  <transition event="test" cond="" target="pass"/>
+  <transition event="*" target="fail"/>
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test537.scxml b/test/samples/w3c/xpath/test537.scxml
new file mode 100644
index 0000000..350d422
--- /dev/null
+++ b/test/samples/w3c/xpath/test537.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the root element of the datamodel is <datamodel> and that <data> elements are its
+children--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="foo" expr="2"/>
+  </datamodel>
+  
+<state id="s0">
+
+ 
+  <transition cond="local-name($foo/..)='datamodel'" target="pass"/>
+  <transition target="fail"/> 
+  </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test539.scxml b/test/samples/w3c/xpath/test539.scxml
new file mode 100644
index 0000000..450bfd9
--- /dev/null
+++ b/test/samples/w3c/xpath/test539.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that if the child of <data> is XML, or if XML is loaded via src=, the processor
+ assigns it as the value of the var --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="var1">
+   <books xmlns="">
+     <book title="title1"/>
+     <book title="title2"/>
+   </books>  
+</data>
+   <data id="var2" src="file:test539.txt"/>
+  </datamodel>
+  
+<state id="s0">
+   <transition cond="$var1/books/book[2]/@title = 'title2'" target="s1"/>
+   <transition target="fail"/>
+  </state>
+  
+<state id="s1">
+   <transition cond="$var2/books/book[2]/@title = 'title2'" target="pass"/>
+   <transition target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test540.scxml b/test/samples/w3c/xpath/test540.scxml
new file mode 100644
index 0000000..641509f
--- /dev/null
+++ b/test/samples/w3c/xpath/test540.scxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that if the child of <data> is a string or if a string is loaded via src=, the processor
+ does white space normalization on it and assigns it as the value of the var --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="var1">123
+4  5  
+</data>
+  <data id="var2" src="file:test540.txt"/>
+  </datamodel>
+  
+<state id="s0">
+  <onentry>
+    <log label="var1 " expr="$var1"/>
+  </onentry>
+   <transition cond="$var1 = '123 4 5' and $var2 = '123 4 5'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test542.scxml b/test/samples/w3c/xpath/test542.scxml
new file mode 100644
index 0000000..1101471
--- /dev/null
+++ b/test/samples/w3c/xpath/test542.scxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that <content> inside <donedata> handles XML and strings,
+ including white space normalization. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ 
+<state id="s0" initial="s01">
+   <transition event="done.state.s0" cond="$_event/data/books/book[1]/@title = 'title1'" target="s1"/>
+     <transition event="done" target="fail"/>
+   <final id="s01">
+     <donedata>
+       <content>
+        <books xmlns="">
+          <book title="title1"/>
+          <book title="title2"/>
+        </books>
+       </content>
+     </donedata>
+   </final>
+ </state>
+ 
+<state id="s1" initial="s11">
+   <transition event="done.state.s1" cond="$_event/data = '123 4 5'" target="pass"/>
+   <transition event="done" target="fail"/>
+    <final id="s11">
+     <donedata>
+       <content>123
+4 5 
+       </content>
+     </donedata>
+   </final>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test543.scxml b/test/samples/w3c/xpath/test543.scxml
new file mode 100644
index 0000000..2c5c6de
--- /dev/null
+++ b/test/samples/w3c/xpath/test543.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that event fields are present as children of _event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+ 
+  
+<state id="s0">
+  <onentry>
+  <!-- event isn't bound until an event is raised -->
+   <raise event="someevent"/>
+  </onentry>
+  <!-- origintype sendid, invokeid and data will not be bound in this event. name, type, and origin
+  are guaranteed to be there. -->
+   <transition event="*" cond="$_event/name and $_event/origin and $_event/type" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test544.scxml b/test/samples/w3c/xpath/test544.scxml
new file mode 100644
index 0000000..fd09502
--- /dev/null
+++ b/test/samples/w3c/xpath/test544.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that kvps are represented as <data> elements under event/data --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+  
+<state id="s0">
+  <onentry>
+   <send event="someevent">
+     <param name="key1" expr="2"/>
+     </send>
+  </onentry>
+  
+   <transition event="*" cond="$_event/data/data[@id='key1'] = 2" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test546.scxml b/test/samples/w3c/xpath/test546.scxml
new file mode 100644
index 0000000..728843b
--- /dev/null
+++ b/test/samples/w3c/xpath/test546.scxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that string content in send is place as a string under event/data --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+  
+<state id="s0">
+  <onentry>
+   <send event="someevent">
+     <content>some string</content>
+     </send>
+  </onentry>
+  
+   <transition event="*" cond="$_event/data = 'some string'" target="pass"/>
+   <transition event="*" target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test547.scxml b/test/samples/w3c/xpath/test547.scxml
new file mode 100644
index 0000000..8c04c95
--- /dev/null
+++ b/test/samples/w3c/xpath/test547.scxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that assiging to a node set performs the assignment to each node.
+ This example is taken from the spec. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" name="scxmltest" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+  <data id="cart">
+   <myCart xmlns="">
+    <books>
+      <book>
+        <title>The Zen Mind</title>
+      </book>
+      <book>
+        <title>Freakonomics</title>
+      </book>
+    </books>
+    <cds>
+      <cd name="Something"/>
+    </cds>
+  </myCart>
+</data>
+  </datamodel>
+     
+<state id="s0">
+  <onentry>
+  <assign location="$cart/myCart/books/book" expr="'The Zen Mind'"/>
+  </onentry>
+  
+   <transition cond="$cart/myCart/books/book[1] = 'The Zen Mind' and  $cart/myCart/books/book[2] = 'The Zen Mind'" target="pass"/>
+   <transition target="fail"/>
+  </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test550.scxml b/test/samples/w3c/xpath/test550.scxml
new file mode 100644
index 0000000..a08e67d
--- /dev/null
+++ b/test/samples/w3c/xpath/test550.scxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that expr can be used to assign a value to a var.  This test uses early binding --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath" binding="early">
+    
+   <state id="s0">
+ 
+       <transition cond="$Var1/text() =2" target="pass"/>
+       <transition target="fail"/>
+   </state>
+   
+   <state id="s1">
+   	<datamodel>
+    <data id="Var1" expr="2"/>
+    </datamodel>
+    </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test551.scxml b/test/samples/w3c/xpath/test551.scxml
new file mode 100644
index 0000000..756d326
--- /dev/null
+++ b/test/samples/w3c/xpath/test551.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that inline content can be used to assign a value to a var.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" binding="early" datamodel="xpath">
+
+    
+   <state id="s0">
+ 
+       <transition cond="$Var1/* or $Var1/text()" target="pass"/>
+       <transition target="fail"/>
+   </state>
+   
+<state id="s1">
+	  <datamodel>
+    <data id="Var1">
+     <node xmlns="">1</node><node xmlns="">2</node><node xmlns="">3</node>
+     </data>
+    </datamodel>
+    </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test552.scxml b/test/samples/w3c/xpath/test552.scxml
new file mode 100644
index 0000000..6795e08
--- /dev/null
+++ b/test/samples/w3c/xpath/test552.scxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that src content can be used to assign a value to a var. Edit
+test552.txt to have a value that's legal for the datamodel in question --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="Var1" src="file:test552.txt"/>
+    </datamodel>
+    
+   <state id="s0">
+ 
+       <transition cond="$Var1/* or $Var1/text()" target="pass"/>
+       <transition target="fail"/>
+   </state>
+
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+   
+
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test553.scxml b/test/samples/w3c/xpath/test553.scxml
new file mode 100644
index 0000000..eb6f24b
--- /dev/null
+++ b/test/samples/w3c/xpath/test553.scxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- we test that the processor does not dispatch the event if evaluation
+of <send>'s args causes an error..  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+
+  
+<state id="s0">
+  <onentry>
+   <!-- timeout event -->
+   <send event="timeout" delay="3s"/>
+   <!-- include a non-existing var in the namelist -->
+   <send event="event1" namelist="$Var2"/> 
+    </onentry>
+ 
+ <!-- if we get the timeout before event1, we assume that event1 hasn't been sent
+ We ignore the error event here because this assertion doesn't mention it -->   
+  <transition event="timeout" target="pass"/>
+  <transition event="event1" target="fail"/>
+ </state>
+ 
+
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test554.scxml b/test/samples/w3c/xpath/test554.scxml
new file mode 100644
index 0000000..64274aa
--- /dev/null
+++ b/test/samples/w3c/xpath/test554.scxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that if the evaluation of <invoke>'s args causes an error, the 
+invocation is cancelled.  In this test, that means that we don't get done.invoke 
+before the timer goes off.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+     
+<state id="s0">
+  <onentry>
+    <send event="timer" delay="2s"/>
+    </onentry>
+    
+  <!-- namelist references an undeclared variable -->
+   <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var2">
+      <content>
+       <scxml initial="subFinal" version="1.0" datamodel="xpath">
+             <final id="subFinal"/>
+            </scxml>
+            </content>
+            </invoke>
+     <transition event="timer" target="pass"/>
+     <transition event="done.invoke" target="fail"/>
+   </state>   
+     
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test555.scxml b/test/samples/w3c/xpath/test555.scxml
new file mode 100644
index 0000000..79dea75
--- /dev/null
+++ b/test/samples/w3c/xpath/test555.scxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the XPATH data model, test that processor coerces types to produce a string
+ where it's needed --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+ <datamodel>
+   <data id="var1">
+   <books xmlns="">
+     <book title="title1"/>
+     <book title="title2"/>
+   </books>  
+</data>
+
+  </datamodel>
+  
+<state id="s0">
+   <onentry>
+    <send eventexpr="$var1"/>
+  </onentry>
+  <transition event="error" target="fail"/>
+  <!-- don't really know what the stringification of that xml structure should  be, but if
+  we get something other than an error, we assume that it worked. -->
+  <transition event="*" target="pass"/>
+  </state>
+  
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test557.scxml b/test/samples/w3c/xpath/test557.scxml
new file mode 100644
index 0000000..6f4eed1
--- /dev/null
+++ b/test/samples/w3c/xpath/test557.scxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that if the child of <data> is XML, or if XML is loaded via src=, the processor
+ assigns it as the value of the var --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+ <datamodel>
+   <data id="var1">
+   <books xmlns="">
+     <book title="title1"/>
+     <book title="title2"/>
+   </books>  
+</data>
+ <data id="var2" src="file:test557.txt"/> 
+  </datamodel>
+  
+<state id="s0">
+   <transition cond="var1.getElementsByTagName('book')[0].getAttribute('title') == 'title1'" target="s1"/>
+   <transition target="fail"/>
+  </state>
+  
+<state id="s1">
+   <transition cond="var2.getElementsByTagName('book')[1].getAttribute('title') == 'title2'" target="pass"/>
+   <transition target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test558.scxml b/test/samples/w3c/xpath/test558.scxml
new file mode 100644
index 0000000..a075100
--- /dev/null
+++ b/test/samples/w3c/xpath/test558.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that if the child of <data> is not XML, or if XML is loaded via src=, 
+ the processor treats the value as a string, does whitespace normalization and assigns it to the var.--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+ <datamodel>
+   <data id="var1">
+this  is 
+a string 
+</data>
+  <data id="var2" src="file:test558.txt"/> 
+  </datamodel>
+  
+<state id="s0">
+   <transition cond="var1 == 'this is a string'" target="s1"/>
+   <transition target="fail"/>
+  </state>
+  
+<state id="s1">
+   <transition cond="var2 == 'this is a string'" target="pass"/>
+   <transition target="fail"/>
+   </state>
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test560.scxml b/test/samples/w3c/xpath/test560.scxml
new file mode 100644
index 0000000..d283b1a
--- /dev/null
+++ b/test/samples/w3c/xpath/test560.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that processor creates correct structure in
+ _event.data when receiving KVPs in an event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+   <onentry>
+    <send event="foo">
+    <param name="aParam" expr="1"/>
+    </send>
+  </onentry>
+  <transition event="foo" cond="_event.data.aParam == 1" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test561.scxml b/test/samples/w3c/xpath/test561.scxml
new file mode 100644
index 0000000..e50e00c
--- /dev/null
+++ b/test/samples/w3c/xpath/test561.scxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that processor creates an ECMAScript object
+ _event.data when receiving JSON in an event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+   <onentry>
+    <send event="foo">
+    <content>
+<books xmlns="">
+<book title="title1"/>
+<book title="title2"/>
+</books>
+</content>
+    </send>
+  </onentry>
+  <transition event="foo" cond="_event.data.getElementsByTagName('book')[1].getAttribute('title') == 'title2'" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test562.scxml b/test/samples/w3c/xpath/test562.scxml
new file mode 100644
index 0000000..f5997bb
--- /dev/null
+++ b/test/samples/w3c/xpath/test562.scxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that processor creates space normalized string in
+ _event.data when receiving anything other than KVPs or XML in an event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+   <onentry>
+    <send event="foo">
+    <content>
+this is  a  
+string
+</content>
+    </send>
+  </onentry>
+  <transition event="foo" cond="_event.data == 'this is a string'" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test567.scxml b/test/samples/w3c/xpath/test567.scxml
new file mode 100644
index 0000000..0aa4680
--- /dev/null
+++ b/test/samples/w3c/xpath/test567.scxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that that any content in the message other than _scxmleventname is used to populate
+_event.data.  --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0">
+<datamodel>
+ <data id="Var1" expr="2"/>
+  </datamodel>
+   
+<state id="s0">
+  <onentry>
+    <send event="timeout" delay="3s"/>
+ <!-- in this case, 'test' will be placed in _scxmleventname.  The <param> should
+ be used to populate _event.data -->
+    <send event="test" targetexpr="$_ioprocessors/processor[@name=&#34;http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor&#34;]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor">
+    <param name="param1" expr="2"/>
+      </send>  
+     </onentry>
+     
+     <!-- if we get this event, we succeed -->
+  <transition event="test" target="s1">
+    <assign location="$Var1" expr="$_event/data/data[@id='param1']/text()"/>
+      </transition>
+  <transition event="*" target="fail"/>
+ </state>
+  
+  <state id="s1">
+    <transition cond="$Var1/text() =2" target="pass"/>
+    <transition target="fail"/>
+    </state>
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test568.scxml b/test/samples/w3c/xpath/test568.scxml
new file mode 100644
index 0000000..e8b888f
--- /dev/null
+++ b/test/samples/w3c/xpath/test568.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that location field is found inside entry for SCXML Event I/O processor in the XPath
+data model.  The tests for the relevant event i/o processors will test that it can be used to
+send events. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+
+  
+<state id="s0">
+  <transition cond="$_ioprocessors/[@name='http://www.w3.org/TR/scxml/#SCXMLEventProcessor']/location/text()" target="pass"/>
+  <transition target="fail"/>
+   
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test569.scxml b/test/samples/w3c/xpath/test569.scxml
new file mode 100644
index 0000000..832a0c0
--- /dev/null
+++ b/test/samples/w3c/xpath/test569.scxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that location field is found inside entry for SCXML Event I/O processor in the ECMAScript
+data model.  The tests for the relevant event i/o processors will test that it can be used to
+send events. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+  <transition cond="_ioprocessors['scxml'].location" target="pass"/>
+  <transition target="fail"/>
+   
+ </state>
+  
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test570.scxml b/test/samples/w3c/xpath/test570.scxml
new file mode 100644
index 0000000..8caa2cd
--- /dev/null
+++ b/test/samples/w3c/xpath/test570.scxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that we generate done.state.id when all a parallel state's children are in final states --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="p0" datamodel="xpath" version="1.0">
+  <datamodel>
+    <data id="Var1" expr="0"/>
+    </datamodel>
+<parallel id="p0">
+  <onentry>
+   <send event="timeout" delay="2s"/>
+   <raise event="e1"/>
+   <raise event="e2"/>
+   </onentry>
+   <!-- record that we get the first done event -->
+   <transition event="done.state.p0s1">
+     <assign location="$Var1" expr="1"/>
+     </transition>
+   <!-- we should get the second done event before done.state.p0 -->
+   <transition event="done.state.p0s2" target="s1"/>
+   <transition event="timeout" target="fail"/>
+
+   
+   <state id="p0s1" initial="p0s11">
+    <state id="p0s11">
+      <transition event="e1" target="p0s1final"/>
+      </state>
+    <final id="p0s1final"/>
+   </state>
+   
+  <state id="p0s2" initial="p0s21">
+    <state id="p0s21">
+       <transition event="e2" target="p0s2final"/>
+     </state>
+    <final id="p0s2final"/>
+   </state>
+  
+ </parallel>
+ 
+ <state id="s1">
+  <!-- if we get done.state.p0, success -->
+  <transition event="done.state.p0" cond="$Var1/text() =1" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+   
+   <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+   <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test576.scxml b/test/samples/w3c/xpath/test576.scxml
new file mode 100644
index 0000000..c5302f5
--- /dev/null
+++ b/test/samples/w3c/xpath/test576.scxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that the 'initial' value of scxml is respected.  We set the value to deeply nested non-default parallel siblings and
+test that both are entered. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s11p112 s11p122" datamodel="xpath" version="1.0">
+
+     
+<state id="s0">
+  <transition target="fail"/>
+</state>
+
+<state id="s1">
+  <onentry>
+    <send event="timeout" delay="1s"/>
+    </onentry>
+  <transition event="timeout" target="fail"/>
+  <state id="s11" initial="s111">
+    <state id="s111"/>
+    <parallel id="s11p1">
+       <state id="s11p11" initial="s11p111">
+         <state id="s11p111"/>
+         <state id="s11p112">
+           <onentry>
+             <raise event="In-s11p112"/>
+             </onentry>
+         </state>
+       </state>
+       <state id="s11p12" initial="s11p121">
+        <state id="s11p121"/>
+        <state id="s11p122">
+          <transition event="In-s11p112" target="pass"/>
+          </state>
+       </state>
+      </parallel>
+  </state>
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file
diff --git a/test/samples/w3c/xpath/test578.scxml b/test/samples/w3c/xpath/test578.scxml
new file mode 100644
index 0000000..bdb5e2d
--- /dev/null
+++ b/test/samples/w3c/xpath/test578.scxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- in the ECMA data model, test that processor creates an ECMAScript object
+ _event.data when receiving JSON in an event --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="ecmascript">
+
+  
+<state id="s0">
+   <onentry>
+    <send event="foo">
+    <content>{ productName : "bar", size : 27 }</content>
+    </send>
+  </onentry>
+  <transition event="foo" cond="_event.data.productName == 'bar'" target="pass"/>
+  <transition event="*" target="fail"/>
+  </state>
+  
+    
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>  
+
+</scxml>
\ No newline at end of file
-- 
cgit v0.12