Removed w3c ecma tests from xpath and vice versa

32 files changed, 3 insertions, 763 deletions

diff --git a/test/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml
index b33342b..14c6686 100644
--- a/test/w3c/ecma/test252.scxml
+++ b/test/w3c/ecma/test252.scxml
@@ -5,7 +5,7 @@ timeout indicates success.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
      
 <state id="s0" initial="s01">
   <onentry>
-    <send event="timeout" delayexpr="'50ms'"/>
+    <send event="timeout" delay="2s"/>
     </onentry>
     
     <transition event="timeout" target="pass"/>
@@ -22,7 +22,7 @@ timeout indicates success.   --><scxml xmlns="http://www.w3.org/2005/07/scxml" x
          <scxml initial="sub0" version="1.0" datamodel="ecmascript">
               <state id="sub0">
              <onentry>
-             <send event="timeout" delayexpr="'25ms'"/>
+             <send event="timeout" delay="2s"/>
              </onentry> 
             <transition event="timeout" target="subFinal"/>
                <onexit>
diff --git a/test/w3c/ecma/test463.scxml b/test/w3c/ecma/test463.scxml
deleted file mode 100644
index 4f32b84..0000000
--- a/test/w3c/ecma/test463.scxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/w3c/ecma/test464.scxml b/test/w3c/ecma/test464.scxml
deleted file mode 100644
index bd640f2..0000000
--- a/test/w3c/ecma/test464.scxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/w3c/ecma/test465.scxml b/test/w3c/ecma/test465.scxml
deleted file mode 100644
index a91bb06..0000000
--- a/test/w3c/ecma/test465.scxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/w3c/ecma/test466.scxml b/test/w3c/ecma/test466.scxml
deleted file mode 100644
index 1431fab..0000000
--- a/test/w3c/ecma/test466.scxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/w3c/ecma/test467.scxml b/test/w3c/ecma/test467.scxml
deleted file mode 100644
index 130b7bc..0000000
--- a/test/w3c/ecma/test467.scxml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/w3c/ecma/test468.scxml b/test/w3c/ecma/test468.scxml
deleted file mode 100644
index 3b6902d..0000000
--- a/test/w3c/ecma/test468.scxml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/w3c/ecma/test469.scxml b/test/w3c/ecma/test469.scxml
deleted file mode 100644
index 02fe476..0000000
--- a/test/w3c/ecma/test469.scxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/w3c/ecma/test470.scxml b/test/w3c/ecma/test470.scxml
deleted file mode 100644
index 3c26bb1..0000000
--- a/test/w3c/ecma/test470.scxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/w3c/ecma/test473.scxml b/test/w3c/ecma/test473.scxml
deleted file mode 100644
index 4a57129..0000000
--- a/test/w3c/ecma/test473.scxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/w3c/ecma/test474.scxml b/test/w3c/ecma/test474.scxml
deleted file mode 100644
index decad75..0000000
--- a/test/w3c/ecma/test474.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test475.scxml b/test/w3c/ecma/test475.scxml
deleted file mode 100644
index 0f9cdfe..0000000
--- a/test/w3c/ecma/test475.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test476.scxml b/test/w3c/ecma/test476.scxml
deleted file mode 100644
index d3fe8e8..0000000
--- a/test/w3c/ecma/test476.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test477.scxml b/test/w3c/ecma/test477.scxml
deleted file mode 100644
index 1726866..0000000
--- a/test/w3c/ecma/test477.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test478.scxml b/test/w3c/ecma/test478.scxml
deleted file mode 100644
index 9821608..0000000
--- a/test/w3c/ecma/test478.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test479.scxml b/test/w3c/ecma/test479.scxml
deleted file mode 100644
index 3d5b1ac..0000000
--- a/test/w3c/ecma/test479.scxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/w3c/ecma/test480.scxml b/test/w3c/ecma/test480.scxml
deleted file mode 100644
index 0fde260..0000000
--- a/test/w3c/ecma/test480.scxml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/w3c/ecma/test481.scxml b/test/w3c/ecma/test481.scxml
deleted file mode 100644
index a0505f6..0000000
--- a/test/w3c/ecma/test481.scxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/w3c/ecma/test482.scxml b/test/w3c/ecma/test482.scxml
deleted file mode 100644
index 00eb3fe..0000000
--- a/test/w3c/ecma/test482.scxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/w3c/ecma/test483.scxml b/test/w3c/ecma/test483.scxml
deleted file mode 100644
index 0a1b236..0000000
--- a/test/w3c/ecma/test483.scxml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that foreach works correctly, iterating over node set in document order.
- This tests assertions 483-485 --><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="var1">
-      <nodes xmlns="">
-       <node/>
-       <node/>
-       <node/>
-      </nodes>
-       </data>
-     </datamodel>
-     
-<state id="s0">
-  <onentry>
-   <foreach array="$var1/nodes/node" item="item" index="pos">
-      <assign location="$item" type="addattribute" attr="position" expr="$pos"/>
-     </foreach>
-  </onentry>
-  
-   <transition cond="$var1/nodes/node[1]/@position = 1 and  $var1/nodes/node[2]/@position = 2 and $var1/nodes/node[3]/@position = 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/w3c/ecma/test537.scxml b/test/w3c/ecma/test537.scxml
deleted file mode 100644
index 350d422..0000000
--- a/test/w3c/ecma/test537.scxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/w3c/ecma/test539.scxml b/test/w3c/ecma/test539.scxml
deleted file mode 100644
index 450bfd9..0000000
--- a/test/w3c/ecma/test539.scxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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/w3c/ecma/test540.scxml b/test/w3c/ecma/test540.scxml
deleted file mode 100644
index 641509f..0000000
--- a/test/w3c/ecma/test540.scxml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/w3c/ecma/test542.scxml b/test/w3c/ecma/test542.scxml
deleted file mode 100644
index 1101471..0000000
--- a/test/w3c/ecma/test542.scxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/w3c/ecma/test543.scxml b/test/w3c/ecma/test543.scxml
deleted file mode 100644
index 2c5c6de..0000000
--- a/test/w3c/ecma/test543.scxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/w3c/ecma/test544.scxml b/test/w3c/ecma/test544.scxml
deleted file mode 100644
index fd09502..0000000
--- a/test/w3c/ecma/test544.scxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/w3c/ecma/test545.scxml b/test/w3c/ecma/test545.scxml
deleted file mode 100644
index 1e12770..0000000
--- a/test/w3c/ecma/test545.scxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that xml content in send is place as XML 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><foo xmlns=""><bar>3</bar></foo></content>
-     </send>
-  </onentry>
-  
-   <transition event="*" cond="$_event/data/foo/bar = 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/w3c/ecma/test546.scxml b/test/w3c/ecma/test546.scxml
deleted file mode 100644
index 728843b..0000000
--- a/test/w3c/ecma/test546.scxml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/w3c/ecma/test547.scxml b/test/w3c/ecma/test547.scxml
deleted file mode 100644
index 8c04c95..0000000
--- a/test/w3c/ecma/test547.scxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml
index 3dd0aeb..87062e4 100644
--- a/test/w3c/ecma/test553.scxml
+++ b/test/w3c/ecma/test553.scxml
@@ -5,7 +5,7 @@ of <send>'s args causes an error..  --><scxml xmlns="http://www.w3.org/2005/07/s
 <state id="s0">
   <onentry>
    <!-- timeout event -->
-   <send event="timeout" delayexpr="'500ms'"/>
+   <send event="timeout" delayexpr="'50ms'"/>
    <!-- generate an invalid namelist -->
    <send event="event1" namelist="&#34;foo"/> 
     </onentry>
diff --git a/test/w3c/ecma/test555.scxml b/test/w3c/ecma/test555.scxml
deleted file mode 100644
index 79dea75..0000000
--- a/test/w3c/ecma/test555.scxml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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/w3c/ecma/test568.scxml b/test/w3c/ecma/test568.scxml
deleted file mode 100644
index e8b888f..0000000
--- a/test/w3c/ecma/test568.scxml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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