886 files changed, 582 insertions, 5916 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e4f2260..24d05ab 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,21 +1,21 @@
 # find_program(XMLLINT xmllint)
 # if (XMLLINT)
-# 	file(GLOB SCXML_FILES samples/uscxml/*.scxml)
+# 	file(GLOB SCXML_FILES uscxml/*.scxml)
 # endif()
 
 if (NOT WIN32)
 	add_executable(test-predicates src/test-predicates.cpp)
 	target_link_libraries(test-predicates uscxml)
-	add_test(test-predicates ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-predicates ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-predicates.scxml)
+	add_test(test-predicates ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-predicates ${CMAKE_SOURCE_DIR}/test/uscxml/test-predicates.scxml)
 	set_target_properties(test-predicates PROPERTIES FOLDER "Tests")
 endif()
 
-add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-execution.scxml)
-add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t5493 ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-communication.scxml)
-add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-donedata.scxml)
+add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-execution.scxml)
+add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t5493 ${CMAKE_SOURCE_DIR}/test/uscxml/test-communication.scxml)
+add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-donedata.scxml)
 
 if (SWI_FOUND)
-	add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t2345 ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-prolog.scxml)
+	add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t2345 ${CMAKE_SOURCE_DIR}/test/uscxml/test-prolog.scxml)
 endif()
 
 # if (FFMPEG_FOUND)
@@ -26,7 +26,7 @@ endif()
 # endif()
 
 if (V8_FOUND)
-	add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-ecmascript.scxml)
+	add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-ecmascript.scxml)
 endif()
 
 if (OPENSCENEGRAPH_FOUND AND OFF)
@@ -40,6 +40,11 @@ target_link_libraries(test-base64 uscxml)
 add_test(test-base64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-base64)
 set_target_properties(test-base64 PROPERTIES FOLDER "Tests")
 
+add_executable(test-trie src/test-trie.cpp)
+target_link_libraries(test-trie uscxml)
+add_test(test-trie ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-trie)
+set_target_properties(test-trie PROPERTIES FOLDER "Tests")
+
 add_executable(test-eventdelay src/test-eventdelay.cpp)
 target_link_libraries(test-eventdelay uscxml)
 add_test(test-eventdelay ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-eventdelay)
@@ -52,10 +57,15 @@ if (OFF)
 	set_target_properties(test-dirmon PROPERTIES FOLDER "Tests")
 endif()
 
+add_executable(test-arabica-namespaces src/test-arabica-namespaces.cpp)
+target_link_libraries(test-arabica-namespaces uscxml)
+add_test(test-arabica-namespaces ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-namespaces ${CMAKE_SOURCE_DIR}/test)
+set_target_properties(test-arabica-namespaces PROPERTIES FOLDER "Tests")
+
 if (NOT WIN32)
 	add_executable(test-arabica-events src/test-arabica-events.cpp)
 	target_link_libraries(test-arabica-events uscxml)
-	add_test(test-arabica-events ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-events ${CMAKE_SOURCE_DIR}/test/samples/uscxml/arabica/test-arabica-events.xml)
+	add_test(test-arabica-events ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-events ${CMAKE_SOURCE_DIR}/test/uscxml/arabica/test-arabica-events.xml)
 	set_target_properties(test-arabica-events PROPERTIES FOLDER "Tests")
 
 	add_executable(test-arabica-xpath src/test-arabica-xpath.cpp)
@@ -74,7 +84,7 @@ if (NOT WIN32)
 	# else()
 	# 	target_link_libraries(test-stress uscxml)
 	# endif()
-	# add_test(test-stress ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-stress ${CMAKE_SOURCE_DIR}/test/samples/w3c)
+	# add_test(test-stress ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-stress ${CMAKE_SOURCE_DIR}/test/w3c)
 	# set_target_properties(test-stress PROPERTIES FOLDER "Tests")
 
 	# if (LIBPURPLE_FOUND)
@@ -102,7 +112,7 @@ set_target_properties(test-cmdline-parsing PROPERTIES FOLDER "Tests")
 
 # add_executable(test-initial-config src/test-initial-config.cpp)
 # target_link_libraries(test-initial-config uscxml)
-# add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-initial-config ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-initial-config.scxml)
+# add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-initial-config ${CMAKE_SOURCE_DIR}/test/uscxml/test-initial-config.scxml)
 # set_target_properties(test-initial-config PROPERTIES FOLDER "Tests")
 
 add_executable(test-datamodel src/test-datamodel.cpp)
@@ -134,7 +144,7 @@ target_link_libraries(test-w3c uscxml)
 set_target_properties(test-w3c PROPERTIES FOLDER "Tests")
 
 file(GLOB_RECURSE W3C_TESTS
-	samples/w3c/*.scxml
+	w3c/*.scxml
 )
 
 foreach( W3C_TEST ${W3C_TESTS} )
diff --git a/test/samples/apache/actions-initial-test.xml b/test/samples/apache/actions-initial-test.xml
deleted file mode 100644
index d2d3e48..0000000
--- a/test/samples/apache/actions-initial-test.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initial="actionsTest">
-  
-  <state id="actionsTest">
-    <initial>
-      <transition target="child1">
-        <cs:var name="foo"/>
-        <cs:var name="delta" expr="${1+2+3}" />
-        <cs:var name="eventsent"/>
-        <if cond="${delta le 3}">
-          <assign name="foo" expr="bar" />
-        <elseif cond="${delta eq 3}"/>
-          <assign name="foo" expr="fubar" />
-        <else/>
-          <assign name="foo" expr="foobar" />
-        </if>
-        <cs:var name="drink" expr="water" />
-        <cs:var name="eat" expr="flies" />
-        <send sendid="send12345" target="freddy" type="frog"
-         event="croak" namelist="drink eat" hints="h2o bzz"
-         delay="${1000+500}" />
-        <cancel sendId="send12345"/>
-        <log expr="leaving" label="entry001" />
-        <event name="event.test"/>
-        <!-- exit will be ignored, makes little sense in initial -->
-        <cs:exit expr="later" namelist="freddy" />
-      </transition>
-    </initial>
-
-    <transition event="event.test">
-      <assign name="eventsent" expr="true"/>
-    </transition>
-
-    <state id="child1"/>
-
-  </state>
-
-</scxml>
\ No newline at end of file
diff --git a/test/samples/apache/actions-parallel-test.xml b/test/samples/apache/actions-parallel-test.xml
deleted file mode 100644
index be9d25c..0000000
--- a/test/samples/apache/actions-parallel-test.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initial="actionsTest">
-  
-  <parallel id="actionsTest">
-    <onentry>
-      <cs:var name="foo"/>
-      <cs:var name="delta" expr="${1+2+3}" />
-      <cs:var name="eventsent"/>
-      <if cond="${delta le 3}">
-        <assign name="foo" expr="bar" />
-      <elseif cond="${delta eq 3}"/>
-        <assign name="foo" expr="fubar" />
-      <else/>
-        <assign name="foo" expr="foobar" />
-      </if>
-      <cs:var name="drink" expr="water" />
-      <cs:var name="eat" expr="flies" />
-      <send sendid="send12345" target="freddy" type="frog"
-       event="croak" namelist="drink eat" hints="h2o bzz"
-       delay="${1000+500}" />
-      <cancel sendId="send12345"/>
-      <log expr="leaving" label="entry001" />
-      <event name="event.test"/>
-      <cs:exit expr="later" namelist="freddy" />
-    </onentry>
-
-    <transition event="event.test">
-      <assign name="eventsent" expr="true"/>
-    </transition>
-
-    <!-- dummy regions -->
-    <state id="state01"/>
-    <state id="state02"/>
-  </parallel>
-
-</scxml>
\ No newline at end of file
diff --git a/test/samples/apache/actions-state-test.xml b/test/samples/apache/actions-state-test.xml
deleted file mode 100644
index 3374e21..0000000
--- a/test/samples/apache/actions-state-test.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="actionsTest">
-  
-  <state id="actionsTest" final="true">
-    <onentry>
-      <cs:var name="foo"/>
-      <cs:var name="delta" expr="${1+2+3}" />
-      <cs:var name="eventsent"/>
-      <if cond="${delta le 3}">
-        <assign name="foo" expr="bar" />
-      <elseif cond="${delta eq 3}"/>
-        <assign name="foo" expr="fubar" />
-      <else/>
-        <assign name="foo" expr="foobar" />
-      </if>
-      <cs:var name="drink" expr="water" />
-      <cs:var name="eat" expr="flies" />
-      <send sendid="send12345" target="freddy" type="frog"
-       event="croak" namelist="drink eat" hints="h2o bzz"
-       delay="${1000+500}" />
-      <cancel sendId="send12345"/>
-      <log expr="leaving" label="entry001" />
-      <event name="event.test"/>
-      <cs:exit expr="later" namelist="freddy" />
-    </onentry>
-
-    <transition event="event.test">
-      <assign name="eventsent" expr="true"/>
-    </transition>
-
-  </state>
-
-</scxml>
\ No newline at end of file
diff --git a/test/samples/apache/assign-test-01.xml b/test/samples/apache/assign-test-01.xml
deleted file mode 100644
index ed7e977..0000000
--- a/test/samples/apache/assign-test-01.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Test "src" attribute of assign element -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:rad="http://foo/bar"
-       version="1.0"
-       initialstate="assign1">
-  
-  <state id="assign1" final="true">
-
-    <datamodel>
-        <data id="foo">
-            <root xmlns="">
-                <foo/>
-            </root>
-        </data>
-        <data id="bar">
-            <root xmlns="">
-                <bar>5</bar>
-            </root>
-        </data>
-    </datamodel>
-
-    <onentry>
-        <assign location="Data(foo,'root/foo')" src="assign-src.xml"/>
-    </onentry>
-
-    <transition cond="Data(foo,'root/foo/a') + Data(bar,'root/bar') eq 15"
-                target="assign2" />
-
-  </state>
-
-  <state id="assign2">
-
-    <datamodel>
-      <data id="jira51data1">
-          <rad:timeout>10</rad:timeout>
-      </data> 
-      <data id="jira51data2">
-          <rad:short xmlns="">20</rad:short>
-      </data>
-    </datamodel>
-
-    <onentry>
-        <assign location="Data(jira51data1,'rad:timeout')" expr="Data(jira51data2,'rad:short')"/>
-    </onentry>
-
-    <transition cond="Data(jira51data1,'rad:timeout') eq 20"
-                target="assign3" />
-
-  </state>
-
-  <state id="assign3" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/assign-test-02.xml b/test/samples/apache/assign-test-02.xml
deleted file mode 100644
index 38ab9b3..0000000
--- a/test/samples/apache/assign-test-02.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   * Licensed to the Apache Software Foundation (ASF) under one or more
-   * contributor license agreements.  See the NOTICE file distributed with
-   * this work for additional information regarding copyright ownership.
-   * The ASF licenses this file to You under the Apache License, Version 2.0
-   * (the "License"); you may not use this file except in compliance with
-   * the License.  You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
--->
-<!-- Regress JIRA 89, incomplete child removal -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:rad="http://foo/bar" version="1.0" initialstate="assign1">
-   <datamodel>
-       <data name="source">
-           <rad:foo>
-               <rad:a>1</rad:a>
-               <rad:b>2</rad:b>
-           </rad:foo>
-       </data>
-       <data name="destination">
-           <rad:bar>
-               <rad:a>3</rad:a>
-               <rad:b>4</rad:b>
-           </rad:bar>
-       </data>
-   </datamodel>
-   <!-- verify the destination contents -->
-   <state id="assign1" final="true">
-       <transition cond="Data(destination,'rad:bar/rad:a') eq 3 and Data(destination,'rad:bar/rad:b') eq 4" target="assign2" />
-   </state>
-   <!-- copy the new contents and verify -->
-   <state id="assign2">
-       <onentry>
-           <assign location="Data(destination,'rad:bar')" expr="Data(source,'rad:foo')" />
-       </onentry>
-       <transition cond="Data(destination,'rad:bar/rad:a') eq 1 and Data(destination,'rad:bar/rad:b') eq 2" target="assign3" />
-   </state>
-   <state id="assign3" final="true" />
-</scxml>
diff --git a/test/samples/apache/bar.xml b/test/samples/apache/bar.xml
deleted file mode 100644
index 3901080..0000000
--- a/test/samples/apache/bar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="bar">
-
-    <state id="bar"/>
-
-</scxml>
-
diff --git a/test/samples/apache/custom-hello-world-01.xml b/test/samples/apache/custom-hello-world-01.xml
deleted file mode 100644
index 5d8a348..0000000
--- a/test/samples/apache/custom-hello-world-01.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for comparison with hello-world.xml by
-     CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM1"
-       xmlns:foo="http://my.custom-actions.domain/CUSTOM2"
-       version="1.0"
-       initialstate="custom">
-
-    <state id="custom" final="true">
-
-        <onentry>
-            <my:hello name="world" />
-            <!-- foo:bar also maps to Hello action -->
-            <foo:bar name="custom action" />
-        </onentry>
-
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/custom-hello-world-02.xml b/test/samples/apache/custom-hello-world-02.xml
deleted file mode 100644
index 7b27ccf..0000000
--- a/test/samples/apache/custom-hello-world-02.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM"
-       version="1.0"
-       initialstate="custom">
-
-    <state id="custom" final="true">
-        
-        <onentry>
-            <my:hello name="child (included) document" />
-        </onentry>
-
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/custom-hello-world-03.xml b/test/samples/apache/custom-hello-world-03.xml
deleted file mode 100644
index c8cfc5e..0000000
--- a/test/samples/apache/custom-hello-world-03.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM"
-       version="1.0"
-       initialstate="custom">
-
-    <state id="custom" final="true">
-        
-        <onentry>
-            <my:send name="overridden local name" />
-        </onentry>
-
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/custom-hello-world-04-el.xml b/test/samples/apache/custom-hello-world-04-el.xml
deleted file mode 100644
index 0d5300b..0000000
--- a/test/samples/apache/custom-hello-world-04-el.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM"
-       version="1.0" initialstate="init">
-    <datamodel>
-        <data id="helloName1" />
-    </datamodel>
-
-    <state id="init">        
-        <onentry>
-            <my:hello name="custom04" />
-        </onentry>
-
-        <transition event="helloevent" target="middle1">
-            <assign name="helloName1" expr="${_eventdatamap.helloevent}" />
-        </transition>
-    </state>
-
-    <state id="middle1">
-        <transition target="custom" cond="${helloName1 eq 'custom04'}" />
-    </state>
-
-    <state id="custom" final="true"/>
-
-</scxml>
-
-
diff --git a/test/samples/apache/custom-hello-world-04-jexl.xml b/test/samples/apache/custom-hello-world-04-jexl.xml
deleted file mode 100644
index c44e9b3..0000000
--- a/test/samples/apache/custom-hello-world-04-jexl.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM"
-       version="1.0" initialstate="init">
-    <datamodel>
-        <data id="helloName1" />
-    </datamodel>
-
-    <state id="init">        
-        <onentry>
-            <my:hello name="custom04a" />
-        </onentry>
-
-        <transition event="helloevent" target="middle1">
-            <assign name="helloName1" expr="_eventdatamap['helloevent']" />
-        </transition>
-    </state>
-
-    <state id="middle1">
-        <transition target="custom1" cond="helloName1 eq 'custom04a'" />
-    </state>
-
-    <state id="custom1">
-        <transition event="custom.next" target="custom2"/>
-    </state>
-
-    <state id="custom2">        
-        <onentry>
-            <my:hello name="custom04b" />
-        </onentry>
-
-        <transition event="helloevent" target="custom3">
-            <assign name="helloName1" expr="_eventdatamap.helloevent" />
-        </transition>
-    </state>
-
-    <state id="custom3">
-        <transition target="end" cond="helloName1 eq 'custom04b'" />
-    </state>
-
-    <state id="end" final="true"/>
-
-</scxml>
-
-
diff --git a/test/samples/apache/datamodel-01.xml b/test/samples/apache/datamodel-01.xml
deleted file mode 100644
index cc874fb..0000000
--- a/test/samples/apache/datamodel-01.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases.
-     Meant to illustrate the usage of SCXML <datamodel> element
-     and the Commons SCXML Data() function -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="main">
-
-    <!-- Root or document datamodel -->
-    <datamodel>
-        <data id="docdata">
-            <root xmlns="">
-                <foo>foo</foo>
-            </root>
-        </data>
-    </datamodel>
-
-    <state id="main">
-
-        <initial>
-            <transition target="ten"/>
-        </initial>
-
-        <!-- datamodel scoped to state "main" -->
-        <datamodel>
-            <data id="mainvar" expr="${0}" />
-            <data id="maindata">
-                <root xmlns="">
-                    <foo>
-                        <bar>bar</bar>
-                    </foo>
-                </root>
-            </data>
-        </datamodel>
-
-        <state id="ten">
-            <onentry>
-                <!-- Assign Usage 1: name is previously defined
-                      <var> or degenerate <data> (as in this case) -->
-                <assign name="mainvar" expr="${10}" />
-            </onentry>
-            <!-- Commons SCXML defines a Data() function to use in conjunction
-                 with the Commons EL expression language. The
-                 first argument is the named XML data tree and the second is
-                 the XPath expression to a node whose value is to be
-                 examined  -->
-            <transition event="ten.done"
-             cond="${mainvar eq 10 and Data(maindata,'root/foo/bar') eq 'bar'}"
-             target="twenty" />
-            <onexit>
-                <!-- Assign Usage 2: location must point to an existing
-                      node  -->
-                <assign location="${Data(maindata,'root/foo/bar')}" expr="baz" />
-            </onexit>
-        </state>
-
-        <state id="twenty">
-            <onentry>
-                <assign name="mainvar" expr="${20}" />
-            </onentry>
-            <transition event="twenty.done"
-             cond="${Data(maindata,'root/foo/bar') eq 'baz' and mainvar eq 20}"
-             target="thirty" />
-            <onexit>
-                <!-- Assign Usage 3: location points to an existing
-                      node, and expr points to an existing node.
-                      In this case, location adopts expr's child nodes.  -->
-                <assign location="${Data(docdata,'root/foo')}"
-                        expr="${Data(maindata,'root/foo')}" />
-                <assign location="${Data(docdata,'root/foo/bar')}"
-                        expr="${10}" />
-            </onexit>
-        </state>
-
-        <state id="thirty">
-            <!-- Arithmetic operations are possible with results from
-                 the Data() function. Note that data "docdata"
-                 did not have a node at 'root/foo/bar' to begin with,
-                 the XML tree was manipulated by the <assign> above -->
-            <transition event="thirty.done"
-             cond="${Data(docdata,'root/foo/bar') gt 5}"
-             target="forty" />
-        </state>
-
-        <state id="forty" final="true" />
-
-    </state>
-
-</scxml>
-
-
diff --git a/test/samples/apache/datamodel-02.xml b/test/samples/apache/datamodel-02.xml
deleted file mode 100644
index b719b8b..0000000
--- a/test/samples/apache/datamodel-02.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases. Meant to illustrate
-     prefixed XPath expressions in the Commons SCXML Data() function -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <!-- Start with a prefixless XPath (see transition cond) -->
-    <state id="ten">
-
-        <datamodel>
-            <data id="data10">
-                <root xmlns="">
-                    <foo>10</foo>
-                </root>
-            </data>
-        </datamodel>
-
-        <transition event="ten.done" cond="${Data(data10,'root/foo') eq 10}"
-                    target="twenty" />
-
-    </state>
-
-    <!-- Already defined (and identical) prefixes -->
-    <state id="twenty" xmlns:ns1="http://namespace.test.domain/1"
-                       xmlns:ns2="http://namespace.test.domain/2">
-
-        <datamodel>
-            <!-- Start with a prefixless XPath -->
-            <data id="data20">
-                <ns1:root>
-                    <ns2:foo>20</ns2:foo>
-                </ns1:root>
-            </data>
-        </datamodel>
-
-        <transition event="twenty.done" cond="${Data(data20,'ns1:root/ns2:foo') eq 20}"
-                    target="thirty" />
-
-    </state>
-
-    <!-- Data without prefixes -->
-    <state id="thirty">
-
-        <datamodel>
-            <!-- Start with a prefixless XPath -->
-            <data id="data30">
-                <root xmlns="http://namespace.test.domain/1">
-                    <foo xmlns="http://namespace.test.domain/2">30</foo>
-                </root>
-            </data>
-        </datamodel>
-
-        <transition event="thirty.done"
-         xmlns:ns1="http://namespace.test.domain/1"
-         xmlns:ns2="http://namespace.test.domain/2"
-         xmlns:ns3="http://namespace.test.domain/3"
-         cond="${Data(data30,'ns1:root/ns2:foo') eq 30}"
-         target="forty" />
-
-    </state>
-
-    <state id="forty" final="true" />
-
-</scxml>
-
-
diff --git a/test/samples/apache/datamodel-03.xml b/test/samples/apache/datamodel-03.xml
deleted file mode 100644
index f8a3310..0000000
--- a/test/samples/apache/datamodel-03.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases. Meant to illustrate
-     prefixed XPath expressions in the Commons SCXML Data() function.
-     Used by org.apache.commons.scxml.NamespacePrefixedPathsTest
-     Also serves as testing the underlying functionality of the
-     underlying parsing technology (here, Digester 1.8) -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="ten">
-
-     <!-- Root data model -->
-     <datamodel>
-
-        <!-- We'll use this for XPaths -->
-        <data id="rootdata"
-              xmlns:ns1="scheme://namespace.test.domain/1"
-              xmlns:ns2="scheme://namespace.test.domain/2"
-              xmlns:ns3="scheme://namespace.test.domain/3">
-             <ns1:root>
-                <ns2:foo>
-                  <ns3:bar>1</ns3:bar>
-                </ns2:foo>
-            </ns1:root>
-        </data>
-
-        <!-- We'll use this for the JUnit test
-             NamespacePrefixedPathsTest.java (scxml package) -->
-        <data id="retval" />
-
-    </datamodel>
-
-    <!-- State data model -->
-    <state id="ten">
-
-        <datamodel>
-
-            <data id="data10" xmlns:ns4="scheme://namespace.test.domain/1">
-                <root xmlns="">
-                    <ns4:foo>
-                      <bar>10</bar>
-                    </ns4:foo>
-                </root>
-            </data>
-
-        </datamodel>
-
-        <onentry>
-            <cs:var xmlns:pre1="scheme://namespace.test.domain/1"
-                 xmlns:pre2="scheme://namespace.test.domain/2"
-                 xmlns:pre3="scheme://namespace.test.domain/3"
-                 name="tentest"
-                 expr="${Data(rootdata,'pre1:root/pre2:foo/pre3:bar') + Data(data10,'root/pre1:foo/bar')}" />
-        </onentry>
-
-        <transition event="ten.done"
-                    cond="${tentest eq 11}"
-                    target="twenty" />
-
-        <onexit>
-            <assign name="retval"
-                    expr="${tentest}" />
-        </onexit>
-
-    </state>
-
-    <!-- Already defined (and different) prefixes -->
-    <state id="twenty" xmlns:ns1="scheme://namespace.test.domain/1"
-                       xmlns:ns2="scheme://namespace.test.domain/2"
-                       xmlns:ns3="scheme://namespace.test.domain/3">
-
-        <datamodel>
-
-            <data id="data20">
-                <ns1:root>
-                    <ns2:foo>20</ns2:foo>
-                </ns1:root>
-            </data>
-
-        </datamodel>
-
-        <onentry>
-            <assign location="${Data(rootdata,'ns1:root/ns2:foo/ns3:bar')}"
-                    expr="${2}" />
-        </onentry>
-
-
-        <!-- Redefine namespace prefixes -->
-        <transition event="twenty.done"
-                    xmlns:ns1="scheme://namespace.test.domain/1"
-                    xmlns:ns2="scheme://namespace.test.domain/2"
-                    cond="${Data(data20,'ns1:root/ns2:foo') eq 20 and Data(rootdata,'ns1:root/ns2:foo/ns3:bar') eq 2}"
-                    target="thirty" />
-
-        <onexit>
-
-            <!-- Redefine different prefixes bound to above namespaces -->
-            <if xmlns:pre1="scheme://namespace.test.domain/1"
-                xmlns:pre2="scheme://namespace.test.domain/2"
-                cond="${Data(data20,'pre1:root/pre2:foo') lt 20}">
-
-                <assign name="retval" expr="Less than 20" />
-
-            <elseif cond="${Data(data20,'pre1:root/pre2:foo') eq 20}" />
-
-                <assign name="retval" expr="Equal to 20" />
-
-            <else/>
-
-                <assign name="retval" expr="Greater than 20" />
-
-            </if>
-
-        </onexit>
-
-    </state>
-
-    <!-- XPath looking at attribute -->
-    <state id="thirty">
-
-        <datamodel>
-
-            <data id="data30">
-                <root xmlns="scheme://namespace.test.domain/1">
-                    <foo xmlns="scheme://namespace.test.domain/2"
-                         xmlns:ns1="scheme://namespace.test.domain/3"
-                         ns1:attfoo="30" attbar="300"/>
-                </root>
-            </data>
-
-        </datamodel>
-
-        <transition event="thirty.done"
-         xmlns:ns1="scheme://namespace.test.domain/1"
-         xmlns:ns2="scheme://namespace.test.domain/2"
-         xmlns:ns3="scheme://namespace.test.domain/3"
-         cond="${Data(data30,'ns1:root/ns2:foo/@ns3:attfoo') + Data(data30,'ns1:root/ns2:foo/@attbar') eq 330}"
-         target="forty" />
-
-    </state>
-
-    <!-- Multiple data, already defined prefixes -->
-    <state id="forty" xmlns:ns1="scheme://namespace.test.domain/1"
-                      xmlns:ns2="scheme://namespace.test.domain/2"
-                      xmlns:ns3="scheme://namespace.test.domain/3"
-                      xmlns:ns4="scheme://namespace.test.domain/4">
-
-        <datamodel>
-
-            <data id="data40">
-                <root xmlns="">
-                    <ns1:foo ns2:attfoo="40"/>
-                </root>
-            </data>
-
-            <data id="data41">
-                <ns3:root>
-                    <ns4:foo>41</ns4:foo>
-                </ns3:root>
-            </data>
-
-        </datamodel>
-
-        <transition event="forty.done"
-         cond="${Data(data40,'root/ns1:foo/@ns2:attfoo') + Data(data41,'ns3:root/ns4:foo') eq 81}"
-         target="fifty" />
-
-    </state>
-
-    <!-- Multiple data, prefixes on elements -->
-    <state id="fifty">
-
-        <datamodel>
-
-            <data id="data50"  xmlns:ns1="scheme://namespace.test.domain/1"
-                                 xmlns:ns2="scheme://namespace.test.domain/2"
-                                 xmlns:ns3="scheme://namespace.test.domain/3">
-                <ns1:root>
-                    <ns2:foo ns3:attfoo="50"/>
-                </ns1:root>
-            </data>
-
-            <data id="data51" xmlns:ns3="scheme://namespace.test.domain/3"
-                                xmlns:ns4="scheme://namespace.test.domain/4">
-                <ns3:root>
-                    <ns4:foo attfoo="51"/>
-                </ns3:root>
-            </data>
-
-        </datamodel>
-
-        <transition event="fifty.done"
-         xmlns:ns1="scheme://namespace.test.domain/1"
-         xmlns:ns2="scheme://namespace.test.domain/2"
-         xmlns:ns3="scheme://namespace.test.domain/3"
-         xmlns:ns4="scheme://namespace.test.domain/4"
-         cond="${Data(data50,'ns1:root/ns2:foo/@ns3:attfoo') + Data(rootdata,'ns1:root/ns2:foo/ns3:bar') eq 52}"
-         target="sixty" />
-
-    </state>
-
-    <!-- Multiple data, prefixes on datamodel and transition elements -->
-    <state id="sixty">
-
-        <datamodel xmlns:ns1="scheme://namespace.test.domain/1"
-                   xmlns:ns2="scheme://namespace.test.domain/2"
-                   xmlns:ns3="scheme://namespace.test.domain/3"
-                   xmlns:ns4="scheme://namespace.test.domain/4">
-
-            <data id="data60">
-                <root xmlns="">
-                    <ns1:foo ns2:attfoo="60"/>
-                </root>
-            </data>
-
-            <data id="data61">
-                <ns3:root>
-                    <ns4:foo attfoo="61"/>
-                </ns3:root>
-            </data>
-
-        </datamodel>
-
-        <transition event="sixty.done"
-         xmlns:pre1="scheme://namespace.test.domain/1"
-         xmlns:pre2="scheme://namespace.test.domain/2"
-         xmlns:pre3="scheme://namespace.test.domain/3"
-         xmlns:pre4="scheme://namespace.test.domain/4"
-         cond="${Data(data60,'root/pre1:foo/@pre2:attfoo') + Data(data61,'pre3:root/pre4:foo/@attfoo') eq 121}"
-         target="seventy">
-
-            <!-- should be 121 -->
-            <log expr="${Data(data60,'root/pre1:foo/@pre2:attfoo') + Data(data61,'pre3:root/pre4:foo/@attfoo')}"/>
-
-        </transition>
-
-    </state>
-
-    <state id="seventy" final="true" />
-
-</scxml>
-
-
diff --git a/test/samples/apache/datamodel-04.xml b/test/samples/apache/datamodel-04.xml
deleted file mode 100644
index 503a858..0000000
--- a/test/samples/apache/datamodel-04.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases.
-     Meant to illustrate the usage of SCXML <datamodel> element
-     to persist some _eventdata -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <!-- Root or document datamodel -->
-    <datamodel>
-        <data id="payload"/>
-    </datamodel>
-
-    <state id="ten">
-        <transition event="ten.done" target="twenty">
-            <assign name="payload" expr="_eventdata" />
-        </transition>
-    </state>
-
-    <state id="twenty">
-        <transition event="twenty.done" target="thirty" />
-        <onexit>
-            <log label="Persisted eventdata.one" expr="payload.one"/>
-            <log label="Persisted eventdata.two" expr="payload.two"/>
-        </onexit>
-    </state>
-
-    <state id="thirty" final="true"/>
-
-</scxml>
-
-
diff --git a/test/samples/apache/edit-profile-config.xml b/test/samples/apache/edit-profile-config.xml
deleted file mode 100644
index cdab498..0000000
--- a/test/samples/apache/edit-profile-config.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-
-  $Id: edit-profile-config.xml 462838 2006-10-11 16:08:36Z rahul $
-
--->
-
-<!--
-
-  Dialog definitions for Shale Use Cases Example Web Application
-  written out as SCXML to demonstrate use of Commons SCXML as one
-  of Shale's Dialog Manager implementations.
-
-  Related artifacts from <dialog name="Edit Profile">...</dialog>
-  in original dialogs definition file from Shale nightlies.
-
--->
-
-<scxml xmlns="http://www.w3.org/2005/01/SCXML" version="1.0"  
-       initialstate="edit">
-
-  <state                id="edit">
-
-    <initial>
-      <transition>
-        <target       next="setup"/>
-      </transition>
-    </initial>
-
-    <!-- global transitions (within state "edit") -->
-
-    <transition      event="faces.outcome"
-                      cond="${outcome eq 'cancel'}">
-      <target         next="cancel"/>
-    </transition>
-
-    <transition      event="faces.outcome"
-                      cond="${outcome eq 'finish'}">
-      <target         next="finish"/>
-    </transition>
-
-    <state              id="setup">
-
-      <onentry>
-        <var          name="setupOutcome"
-                      expr="#{profile$edit.setup}" />
-      </onentry>
-
-      <transition     cond="${setupOutcome eq 'success'}">
-        <target       next="page1"/>
-      </transition>
-
-    </state>
-
-    <state              id="page1">
-
-      <transition    event="faces.outcome"
-                      cond="${outcome eq 'next'}">
-        <target       next="page2"/>
-      </transition>
-
-    </state>
-
-    <state              id="page2">
-
-      <transition    event="faces.outcome"
-                      cond="${outcome eq 'previous'}">
-        <target       next="page1"/>
-      </transition>
-
-      <transition    event="faces.outcome"
-                      cond="${outcome eq 'next'}">
-        <target       next="page3"/>
-      </transition>
-
-    </state>
-
-    <state              id="page3">
-
-      <transition    event="faces.outcome"
-                      cond="${outcome eq 'previous'}">
-        <target       next="page2"/>
-      </transition>
-
-      <transition    event="faces.outcome"
-                      cond="${outcome eq 'next'}">
-        <target       next="editExit"/>
-      </transition>
-
-    </state>
-
-  </state>
-
-  <state                id="cancel">
-
-    <onentry>
-      <var            name="cancelOutcome"
-                      expr="#{profile$edit.cancel}" />
-    </onentry>
-
-    <transition       cond="${cancelOutcome eq 'success'}">
-      <var            name="outcome"
-                      expr="cancel"/>
-      <target         next="editExit"/>
-    </transition>
-
-  </state> 
-
-  <state                id="finish">
-
-    <onentry>
-      <var            name="finishOutcome"
-                      expr="#{profile$edit.finish}" />
-    </onentry>
-
-    <transition       cond="${finishOutcome eq 'username'}">
-      <target         next="page1"/>
-    </transition>
-
-    <transition       cond="${finishOutcome eq 'password'}">
-      <target         next="page1"/>
-    </transition>
-
-    <transition       cond="${finishOutcome eq 'success'}">
-      <var            name="outcome"
-                      expr="success"/>
-      <target         next="editExit"/>
-    </transition>
-
-  </state>
-
-  <state                id="editExit"
-                     final="true" />
-
-</scxml>
diff --git a/test/samples/apache/eventdata-01.xml b/test/samples/apache/eventdata-01.xml
deleted file mode 100644
index c07d42d..0000000
--- a/test/samples/apache/eventdata-01.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-      version="1.0"
-      datamodel="ecmascript"
-      initialstate="state1">
-     <state id="state1">
-           <transition event="event.foo" cond="_event.data == 2"
-                       target="state2"/>
-           <transition event="event.foo" cond="_event.data == 3"
-                       target="state3"/>
-           <transition event="event.foo">
-				<log expr="'event.name: ' + _event.name" />
-        	</transition>
-     </state>
-     <state id="state2" final="true"/>
-     <state id="state3">
-           <transition event="event.bar" target="state4"
-                       cond="_event.data == 4"/>
-           <transition event="event.bar" target="state5"
-                       cond="_event.data == 5"/>
-           <transition event="event.bar" target="state6"
-                       cond="_event.data == 6"/>
-     </state>
-     <state id="state4" final="true"/>
-     <state id="state5" final="true"/>
-     <state id="state6">
-           <transition event="event.baz" target="state7"
-                       cond="_event.data == 7"/>
-     </state>
-     <state id="state7" final="true"/>
-</scxml>
diff --git a/test/samples/apache/eventdata-02.xml b/test/samples/apache/eventdata-02.xml
deleted file mode 100644
index df130ae..0000000
--- a/test/samples/apache/eventdata-02.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-      version="1.0"
-      datamodel="ecmascript"
-      initialstate="state0">
-     <state id="state0">
-           <!-- Payload can be any object, such as a String ... -->
-           <transition event="connection.alerting"
-                       cond="_event.data == 'line1'" target="state1"/>
-           <transition event="connection.alerting"
-                       cond="_event.data == 'line2'" target="state2"/>
-     </state>
-     <state id="state1" final="true"/>
-     <state id="state2">
-           <!-- ... or an arbitrary, user defined object. -->
-           <transition event="connection.alerting"
-                       cond="_event.data.line == 3" target="state3"/>
-           <transition event="connection.alerting"
-                       cond="_event.data.line == 4" target="state4"/>
-     </state>
-     <state id="state3" final="true"/>
-     <state id="state4" final="true"/>
-</scxml>
diff --git a/test/samples/apache/eventdata-03.xml b/test/samples/apache/eventdata-03.xml
deleted file mode 100644
index d4c4388..0000000
--- a/test/samples/apache/eventdata-03.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-      version="1.0"
-      initialstate="ten">
-
-    <datamodel>
-        <data id="rootdata">
-            <root xmlns="">
-                <one>1</one>
-                <two>2</two>
-            </root>
-        </data>
-    </datamodel>
-
-    <state id="ten">
-        <transition event="event.foo" target="twenty"/>
-    </state>
-
-    <state id="twenty">
-        <onentry>
-            <cs:var name="one" expr="Data(rootdata,'root/one')"/>
-            <cs:var name="two" expr="Data(rootdata,'root/two')"/>
-            <send event="'event.bar'" namelist="one two"/>
-        </onentry>
-        <transition event="event.bar"
-            cond="_eventdatamap['event.bar'].one + _eventdatamap['event.bar'].two eq 3"
-            target="thirty"/>
-    </state>
-
-    <state id="thirty" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/eventdata-04.xml b/test/samples/apache/eventdata-04.xml
deleted file mode 100644
index 541d2e9..0000000
--- a/test/samples/apache/eventdata-04.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-     version="1.0"
-     initialstate="start">
-
-   <parallel id="start">
-
-       <state id="simulatedUser">
-           <datamodel>
-               <data name="one" expr="1" />
-               <data name="two" expr="2" />
-           </datamodel>
-
-           <onentry>
-               <send event="'event.bar'" namelist="one two" delay="'100ms'"/>
-           </onentry>
-           <transition event="event.bar">
-               <log label="'simulatedUser'" expr="_eventdatamap['event.bar'].one + ', ' + _eventdatamap['event.bar'].two"/>
-           </transition>
-       </state>
-
-       <state id="counter">
-           <initial>
-               <transition target="twenty"/>
-           </initial>
-
-           <state id="twenty">
-               <transition event="event.bar"
-                   cond="_eventdatamap['event.bar'].one + _eventdatamap['event.bar'].two eq 3"
-                   target="thirty"/>
-               <transition event="event.bar">
-                   <log label="'event.bar in twenty state'" expr="_eventdatamap['event.bar'].one + ', ' + _eventdatamap['event.bar'].two"/>
-               </transition>
-           </state>
-
-           <state id="thirty" final="true"/>
-       </state>
-
-   </parallel>
-
-</scxml>
diff --git a/test/samples/apache/external-hello-world.xml b/test/samples/apache/external-hello-world.xml
deleted file mode 100644
index b6d1b9f..0000000
--- a/test/samples/apache/external-hello-world.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for testing custom actions in external document pulled in via
-     the src attributes by ExternalCustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.custom-actions.domain/CUSTOM"
-       version="1.0"
-       initialstate="external-hello">
-
-    <state id="external-hello" final="true" src="custom-hello-world-02.xml">
-
-        <onentry>
-            <my:hello name="parent document" />
-        </onentry>
-
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/foo.xml b/test/samples/apache/foo.xml
deleted file mode 100644
index 486d36e..0000000
--- a/test/samples/apache/foo.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="foo">
-
-    <state id="foo"/>
-
-</scxml>
-
diff --git a/test/samples/apache/hello-world.xml b/test/samples/apache/hello-world.xml
deleted file mode 100644
index 7647899..0000000
--- a/test/samples/apache/hello-world.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for comparison with custom-hello-world.xml by
-     CustomActionTest.java in model package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="hello">
-
-    <state id="hello" final="true">
-        <onentry>
-            <log expr="'hello world'" />
-        </onentry>
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/history-deep-01.xml b/test/samples/apache/history-deep-01.xml
deleted file mode 100644
index 209a974..0000000
--- a/test/samples/apache/history-deep-01.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document is an example of using deep history
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="flow">
-
-    <state id="flow">
-        <initial>
-            <transition target="phases"/>
-        </initial>
-
-        <!-- deep history is specified by setting the type attribute
-             to "deep" -->
-
-        <history id="hist" type="deep">
-
-            <!-- This is the transition to be followed if no
-                 prior history is available -->
-
-            <transition target="phases"/>
-
-        </history>
-
-        <state id="phases">
-
-            <initial>
-                <transition target="phase1"/>
-            </initial>
-
-            <state id="phase1">
-                <transition event="phase.done" target="phase2"/>
-            </state>
-
-            <state id="phase2">
-                <transition event="phase.done" target="phase3"/>
-            </state>
-
-            <state id="phase3" final="true" />
-
-        </state>
-
-        <transition event="flow.pause" target="interrupted"/>
-
-        <transition event="flow.terminate" target="terminated"/>
-
-    </state>
-
-    <state id="interrupted">
-
-        <transition event="flow.resume" target="hist"/>
-
-        <transition event="flow.terminate" target="terminated"/>
-
-    </state>
-
-    <state id="terminated" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/history-default-01.xml b/test/samples/apache/history-default-01.xml
deleted file mode 100644
index cf2f70f..0000000
--- a/test/samples/apache/history-default-01.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document is an example of specifying default transitions for
-   history states (if the parent state has never been visited before)
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="state1">
-
-    <state id="state1">
-        <initial>
-            <transition target="history1"/>
-        </initial>
-
-        <!-- shallow history, explicit default transition -->
-
-        <history id="history1">
-            <transition next="state11"/>
-        </history>
-
-        <state id="state11">
-            <transition event="state.next" target="state2"/>
-        </state>
-
-    </state>
-
-    <state id="state2">
-        <initial>
-            <transition target="history2"/>
-        </initial>
-
-        <!-- deep history, explicit default transition -->
-
-        <history id="history2" type="deep">
-            <transition next="state211"/>
-        </history>
-
-        <state id="state21">
-
-            <initial>
-                <transition target="state212"/>
-            </initial>
-
-            <state id="state211">
-                <transition event="state.next" target="history3"/>
-            </state>
-
-            <state id="state212">
-                <transition event="state.next" target="history3"/>
-            </state>
-
-        </state>
-
-    </state>
-
-    <state id="state3">
-
-        <initial>
-            <transition target="state31"/>
-        </initial>
-
-        <!-- shallow history, no default transition specified,
-             reuse initial as default transition -->
-
-        <history id="history3"/>
-
-        <state id="state31">
-                <transition event="state.next" target="state4"/>
-        </state>
-        
-    </state>
-
-    <state id="state4" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/history-shallow-01.xml b/test/samples/apache/history-shallow-01.xml
deleted file mode 100644
index 20b5bb5..0000000
--- a/test/samples/apache/history-shallow-01.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document is an example of using shallow history
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-    initialstate="flow">
-
-    <state id="flow">
-        <initial>
-            <transition target="phase1"/>
-        </initial>
-
-        <!-- history defaults to shallow, optionally one can set
-             the type attribute to "shallow" for identical results -->
-
-        <history id="hist">
-
-            <!-- This is the transition to be followed if no
-                 prior history is available -->
-
-            <transition target="phase1"/>
-
-        </history>
-
-        <state id="phase1">
-            <transition event="phase.done" target="phase2"/>
-        </state>
-
-        <state id="phase2">
-            <transition event="phase.done" target="phase3"/>
-        </state>
-
-        <state id="phase3" final="true"/>
-
-        <transition event="flow.pause" target="interrupted"/>
-
-        <transition event="flow.terminate" target="terminated"/>
-
-    </state>
-
-    <state id="interrupted">
-
-        <transition event="flow.resume" target="hist"/>
-
-        <transition event="flow.terminate" target="terminated"/>
-
-    </state>
-
-    <state id="terminated" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/invoked-01.xml b/test/samples/apache/invoked-01.xml
deleted file mode 100644
index a523995..0000000
--- a/test/samples/apache/invoked-01.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="state1">
-
-    <state id="state1">
-        <onentry>
-            <log expr="'foo is ' + foo + ' and bar is ' + bar" />
-        </onentry>
-        <transition event="invoked.next" target="state2" />
-    </state>
-
-    <state id="state2" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/invoked-02.xml b/test/samples/apache/invoked-02.xml
deleted file mode 100644
index b1b471a..0000000
--- a/test/samples/apache/invoked-02.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="state1">
-
-    <state id="state1">
-        <onentry>
-            <send event="'invoked.next'" />
-        </onentry>
-        <transition event="invoked.next" target="state2" />
-    </state>
-
-    <state id="state2" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/invoked-03-01.xml b/test/samples/apache/invoked-03-01.xml
deleted file mode 100644
index 3b73a66..0000000
--- a/test/samples/apache/invoked-03-01.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used by InvokeTest#testInvoke03Sample() -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="s1">
-
-    <state id="s1">
-        <onentry>
-            <log expr="'    Inner invoke ...'"/>
-        </onentry>
-        <transition event="s1.next" target="s2"/>
-    </state>
-
-    <state id="s2" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/invoked-03.xml b/test/samples/apache/invoked-03.xml
deleted file mode 100644
index 91244e8..0000000
--- a/test/samples/apache/invoked-03.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used by InvokeTest#testInvoke03Sample() -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="state1">
-
-    <state id="state1">
-        <onentry>
-            <log expr="'  Outer invoke ...'"/>
-        </onentry>
-        <invoke type="scxml" src="invoked-03-01.xml"/>
-        <transition event="state1.next" target="end1" />
-    </state>
-
-    <state id="end1" final="true">
-        <onentry>
-            <log expr="'    Inner invoke completed'"/>
-        </onentry>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/invoker-01.xml b/test/samples/apache/invoker-01.xml
deleted file mode 100644
index 5355896..0000000
--- a/test/samples/apache/invoker-01.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="invoker">
-
-    <state id="invoker">
-        <onentry>
-            <log expr="'Begin invoke test ...'" />
-        </onentry>
-        <invoke type="scxml" src="invoked-01.xml">
-            <param name="foo" expr="'foo'" />
-            <param name="bar" expr="'bar'" />
-            <finalize>
-                <log expr="'Finalizing ...'" />
-            </finalize>
-        </invoke>
-        <transition event="invoker.invoke.done" target="end" />
-    </state>
-
-    <state id="end" final="true" />
-
-</scxml>
diff --git a/test/samples/apache/invoker-02.xml b/test/samples/apache/invoker-02.xml
deleted file mode 100644
index a6fb2cb..0000000
--- a/test/samples/apache/invoker-02.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="invoker">
-
-    <state id="invoker">
-        <invoke type="scxml" src="invoked-02.xml"/>
-        <transition event="invoker.invoke.done" target="end" />
-    </state>
-
-    <state id="end" final="true" />
-
-</scxml>
diff --git a/test/samples/apache/invoker-03.xml b/test/samples/apache/invoker-03.xml
deleted file mode 100644
index be2d1fa..0000000
--- a/test/samples/apache/invoker-03.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used by InvokeTest#testInvoke03Sample() -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="invoker">
-
-    <state id="invoker">
-        <onentry>
-            <log expr="'Invoker ...'"/>
-        </onentry>
-        <invoke type="scxml" src="invoked-03.xml"/>
-        <transition event="invoker.invoke.done" target="end">
-            <log expr="'  Outer invoke completed'"/>
-        </transition>
-    </state>
-
-    <state id="end" final="true">
-        <onentry>
-            <log expr="'Invoker completed'"/>
-        </onentry>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/invoker-04.xml b/test/samples/apache/invoker-04.xml
deleted file mode 100644
index 81c1bb8..0000000
--- a/test/samples/apache/invoker-04.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases.
-     Meant to illustrate the usage of SCXML <param> element as part
-     of an invocation using a custom invoker -->
-     
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="wait">
-
-    <datamodel>
-        <data id="foo">
-            <bar>foo</bar>
-        </data>
-    </datamodel>
-
-    <state id="wait">
-	    <transition event="test.trigger" target="first"/>
-    </state>
-    
-    <state id="first">
-        <invoke src="FirstTestSrc" type="x-test">
-            <param name="ding" expr="Data(foo,'node()')"/>   
-        </invoke>
-        <transition event="test.trigger" target="second"/>
-    </state>
-
-    <state id="second">
-        <invoke src="SecondTestSrc" type="x-test">
-            <param name="Data(foo,'node()')"/>   
-        </invoke>
-        <transition event="test.trigger" target="third"/>
-    </state>
-    
-    <state id="third">
-        <invoke src="ThirdTestSrc" type="x-test">
-            <param name="Data(foo,'gibberish')"/>   
-        </invoke>
-    </state>
-</scxml>
\ No newline at end of file
diff --git a/test/samples/apache/issue62-01-ext.xml b/test/samples/apache/issue62-01-ext.xml
deleted file mode 100644
index 8c65a78..0000000
--- a/test/samples/apache/issue62-01-ext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="ext">
-
-    <state id="ext">
-        <transition event="foo">
-            <log expr="'Stay transition in issue 62 test'"/>
-        </transition>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/issue62-01.xml b/test/samples/apache/issue62-01.xml
deleted file mode 100644
index 3599e5e..0000000
--- a/test/samples/apache/issue62-01.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="s1">
-
-    <state id="s1">
-        <initial>
-            <transition target="s1.1" />
-        </initial>
-        <state id="s1.1" src="issue62-01-ext.xml#ext" />
-        <state id="s1.2" src="issue62-01-ext.xml#ext" />
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/issue62-02-ext.xml b/test/samples/apache/issue62-02-ext.xml
deleted file mode 100644
index 98da5d6..0000000
--- a/test/samples/apache/issue62-02-ext.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="e1">
-
-    <state id="e1">
-        <initial>
-            <transition target="e1.1"/>
-        </initial>
-        <state id="e1.1">
-            <initial>
-                <transition target="e1.1.1"/>
-            </initial>
-            <state id="e1.1.1">
-                <transition event="bar" target="e1.1.2"/>
-            </state>
-            <state id="e1.1.2">
-                <transition event="baz" target="e1.2"/>
-            </state>
-        </state>
-        <state id="e1.2" final="true"/>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/issue62-02.xml b/test/samples/apache/issue62-02.xml
deleted file mode 100644
index 8e52e42..0000000
--- a/test/samples/apache/issue62-02.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="s1">
-
-    <state id="s1">
-        <transition event="foo" target="s2" />
-    </state>
-
-    <state id="s2">
-        <initial>
-            <transition target="s2.1"/>
-        </initial>
-        <state id="s2.1" src="issue62-02-ext.xml#e1" />
-        <transition event="s2.1.done" target="s3"/>
-    </state>
-
-    <state id="s3" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/issue62-03-ext.xml b/test/samples/apache/issue62-03-ext.xml
deleted file mode 100644
index 0168447..0000000
--- a/test/samples/apache/issue62-03-ext.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="e1">
-
-    <state id="e1">
-        <initial>
-            <transition target="e1.1"/>
-        </initial>
-        <state id="e1.1">
-            <initial>
-                <transition target="e1.1.1"/>
-            </initial>
-            <state id="e1.1.1">
-                <transition event="bar" target="e1.1.2"/>
-            </state>
-            <state id="e1.1.2">
-                <transition event="baz" target="e1.2"/>
-            </state>
-        </state>
-        <final id="e1.2"/>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/issue62-03.xml b/test/samples/apache/issue62-03.xml
deleted file mode 100644
index 46b8991..0000000
--- a/test/samples/apache/issue62-03.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="s1">
-
-    <state id="s1">
-        <transition event="foo" target="s2" />
-    </state>
-
-    <state id="s2">
-        <initial>
-            <transition target="s2.1"/>
-        </initial>
-        <state id="s2.1" src="issue62-03-ext.xml#e1" />
-        <transition event="s2.1.done" target="s3"/>
-    </state>
-
-    <final id="s3"/>
-
-</scxml>
diff --git a/test/samples/apache/issue64-01.xml b/test/samples/apache/issue64-01.xml
deleted file mode 100644
index bb848fe..0000000
--- a/test/samples/apache/issue64-01.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Correct SCXML document -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="tranbug">
-
-    <state id="tranbug">
-         <datamodel>
- 			<data id="dummy" expr="'somedata'"/>
-         </datamodel>
-        <onentry>
-            <log expr="'Begin transition bug test ...'" />
-        </onentry>
-        <transition event="show.bug" target="end">
-         <log expr="dummy" />
-         <log expr="'*****' + dummy" />
-        </transition>
-    </state>
-    <state id="end" final="true" />
-
-</scxml>
-
-
diff --git a/test/samples/apache/issue64-02.xml b/test/samples/apache/issue64-02.xml
deleted file mode 100644
index 7e44d30..0000000
--- a/test/samples/apache/issue64-02.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Bad SCXML document, many elements will be ignored with warnings from parser -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:my="http://my.foo.example/"
-       version="1.0"
-       initialstate="tranbug">
-
-    <datamodel>
-        <data id="foo">
-            <alpha xmlns="">
-                <beta/>
-            </alpha>
-        </data>
-        <misplaced/>
-    </datamodel>
-
-    <state id="tranbug">
-        <onentry>
-            <log expr="'Begin transition bug test ...'" />
-            <foo/>
-            <my:bar/>
-        </onentry>
-        <transition event="show.bug" target="end">
-         <!-- For example, FOLLOWING datamodel IS MISPLACED -->
-         <datamodel>
- 			<data id="dummy" expr="'somedata'"/>
-         </datamodel>
-         <log expr="dummy" />
-         <log expr="'*****' + dummy" />
-        </transition>
-    </state>
-
-    <my:baz/>
-    
-    <state id="end" final="true" />
-
-</scxml>
-
-
diff --git a/test/samples/apache/jsp-rootctx-test.xml b/test/samples/apache/jsp-rootctx-test.xml
deleted file mode 100644
index 6a71579..0000000
--- a/test/samples/apache/jsp-rootctx-test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" 
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="rootCtxTest">
-  
-  <state id="rootCtxTest" final="true">
-    <onentry>
-      <!-- 'foo' must exist in host JSP context -->
-      <assign name="foo" expr="${foo+1}" />
-      <cs:var name="bar" expr="a brand new value" />
-    </onentry>
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/log-on-config.xml b/test/samples/apache/log-on-config.xml
deleted file mode 100644
index b57780e..0000000
--- a/test/samples/apache/log-on-config.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-
-  $Id: log-on-config.xml 462838 2006-10-11 16:08:36Z rahul $
-
--->
-
-<!--
-
-  Dialog definitions for Shale Use Cases Example Web Application
-  written out as SCXML to demonstrate use of Commons SCXML as one
-  of Shale's Dialog Manager implementations.
-
-  Related artifacts from <dialog name="Log On">...</dialog>
-  in original dialogs definition file from Shale nightlies.
-
--->
-
-<scxml xmlns="http://www.w3.org/2005/01/SCXML" version="1.0"  
-       initialstate="checkCookie">
-
-
-  <state                 id="checkCookie">
-
-    <onentry>
-      <var             name="cookieOutcome"
-                       expr="#{profile$logon.check}" />
-    </onentry>
-
-    <transition        cond="${cookieOutcome eq 'authenticated'}">
-      <target          next="exit"/>
-    </transition>
-
-    <transition        cond="${cookieOutcome eq 'unauthenticated'}">
-      <target          next="logon"/>
-    </transition>
-
-  </state>
-
-  <state                 id="logon">
-
-    <transition       event="faces.outcome"
-                       cond="${outcome eq 'authenticated'}">
-      <target          next="exit"/>
-    </transition>
-
-    <transition       event="faces.outcome"
-                       cond="${outcome eq 'create'}">
-      <target          next="createProfile"/>
-    </transition>
-
-  </state>
-
-  <state                 id="createProfile"
-                        src="edit-profile-config.xml" >
-
-      <transition     event="createProfile.done"
-                       cond="${outcome eq 'success' or outcome eq 'cancel'}">
-        <target        next="exit"/>
-      </transition>
-
-  </state>
-
-  <state                 id="exit"
-                      final="true" />
-
-</scxml>
diff --git a/test/samples/apache/microwave-01.xml b/test/samples/apache/microwave-01.xml
deleted file mode 100644
index 86efa26..0000000
--- a/test/samples/apache/microwave-01.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses JSP 2.0 EL as the expressions language.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="off">
-  
-  <!--  trivial microwave oven example -->
-  <state id="off">
-    <!-- off state -->
-    <transition event="turn_on" target="on"/>
-  </state>
-
-  <state id="on">
-    <initial>
-      <transition target="idle"/>
-    </initial>
-
-    <!-- on/pause state -->
-    <onentry>
-      <!-- we assume the cook_time is passed in as a context parameter -->
-      <if cond="${empty cook_time}">
-        <!-- default setting -->
-        <cs:var name="cook_time" expr="${5}"/>
-      </if>
-      <!-- again, door_closed should be a part of a global context -->
-      <if cond="${empty door_closed}">
-        <!-- default setting -->
-        <cs:var name="door_closed" expr="${true}"/>
-      </if>
-      <!-- timer variable -->
-      <cs:var name="timer" expr="${0}"/>
-    </onentry>
-
-    <transition event="turn_off" target="off"/>
-
-    <transition cond="${timer ge cook_time}" target="off"/>
-
-    <state id="idle">
-      <!-- default immediate transition -->
-      <transition cond="${door_closed}" target="cooking"/>
-
-      <!-- start cooking -->
-      <transition event="door_close" target="cooking">
-        <assign name="door_closed" expr="${true}"/>
-      </transition>
-    </state>
-
-    <state id="cooking">
-      <transition event="door_open" target="idle">
-        <assign name="door_closed" expr="${false}"/>
-      </transition> 
-      <transition event="time" target="cooking">
-        <assign name="timer" expr="${timer + 1}"/>
-      </transition>
-    </state>
-
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/microwave-02-legacy.xml b/test/samples/apache/microwave-02-legacy.xml
deleted file mode 100644
index eaeb14a..0000000
--- a/test/samples/apache/microwave-02-legacy.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses JSP 2.0 EL as the expressions language.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initialstate="microwave"> 
-
-  <!--  trivial microwave oven example -->
-  <!-- using parallel and In() predicate -->
-
-  <state id="microwave">
-    <parallel id="parts">
-      <state id="oven">
-        <initial>
-          <transition target="off"/>
-        </initial>
-
-        <state id="off">
-          <!-- off state -->
-          <transition event="turn_on" target="on"/>
-        </state>
-        
-        <state id="on">
-          <initial>
-            <transition target="idle"/>
-          </initial>
-
-          <!-- on/pause state -->
-          <onentry>
-            <!-- we assume the cook_time is passed in as a context parameter -->
-            <if cond="${empty cook_time}">
-              <!-- default setting -->
-              <var name="cook_time" expr="${5}"/>
-            </if>
-            <!-- timer variable -->
-            <var name="timer" expr="${0}"/>
-          </onentry>
-          
-          <transition event="turn_off" target="off"/>
-
-          <transition cond="${timer ge cook_time}" target="off"/>
-          
-          <state id="idle">
-            <transition cond="${In('closed')}" target="cooking"/>
-          </state>
-          
-          <state id="cooking">
-            <transition cond="${not In('closed')}" target="idle"/>
-
-            <transition event="time" target="cooking">
-              <assign name="timer" expr="${timer + 1}"/>
-            </transition>
-          </state>
-        </state>
-      </state>
-
-      <state id="door">
-        <initial>
-          <transition target="closed"/>
-        </initial>
-        <state id="closed">
-          <transition event="door_open" target="open"/>
-        </state>
-        <state id="open">
-          <transition event="door_close" target="closed"/>
-        </state>
-      </state>
-    </parallel>
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/microwave-02.xml b/test/samples/apache/microwave-02.xml
deleted file mode 100644
index c03fe05..0000000
--- a/test/samples/apache/microwave-02.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses JSP 2.0 EL as the expressions language.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" 
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="microwave"> 
-
-  <!--  trivial microwave oven example -->
-  <!-- using parallel and In() predicate -->
-
-  <parallel id="microwave">
-    <state id="oven">
-      <initial>
-        <transition target="off"/>
-      </initial>
-
-      <state id="off">
-        <!-- off state -->
-        <transition event="turn_on" target="on"/>
-      </state>
-      
-      <state id="on">
-        <initial>
-          <transition target="idle"/>
-        </initial>
-
-        <!-- on/pause state -->
-        <onentry>
-          <!-- we assume the cook_time is passed in as a context parameter -->
-          <if cond="${empty cook_time}">
-            <!-- default setting -->
-            <cs:var name="cook_time" expr="${5}"/>
-          </if>
-          <!-- timer variable -->
-          <cs:var name="timer" expr="${0}"/>
-        </onentry>
-        
-        <transition event="turn_off" target="off"/>
-
-        <transition cond="${timer ge cook_time}" target="off"/>
-        
-        <state id="idle">
-          <transition cond="${In('closed')}" target="cooking"/>
-        </state>
-        
-        <state id="cooking">
-          <transition cond="${not In('closed')}" target="idle"/>
-
-          <transition event="time" target="cooking">
-            <assign name="timer" expr="${timer + 1}"/>
-          </transition>
-        </state>
-      </state>
-    </state>
-
-    <state id="door">
-      <initial>
-        <transition target="closed"/>
-      </initial>
-      <state id="closed">
-        <transition event="door_open" target="open"/>
-      </state>
-      <state id="open">
-        <transition event="door_close" target="closed"/>
-      </state>
-    </state>
-  </parallel>
-
-</scxml>
diff --git a/test/samples/apache/microwave-03.xml b/test/samples/apache/microwave-03.xml
deleted file mode 100644
index 887b1a6..0000000
--- a/test/samples/apache/microwave-03.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses Commons JEXL as the expressions language.
-   Needs SCXMLParser.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="off">
-  
-  <!--  trivial microwave oven example -->
-  <state id="off">
-    <!-- off state -->
-    <transition event="turn_on" target="on"/>
-  </state>
-
-  <state id="on">
-    <initial>
-      <transition target="idle"/>
-    </initial>
-
-    <!-- on/pause state -->
-    <onentry>
-      <!-- we assume the cook_time is passed in as a context parameter -->
-      <if cond="empty(cook_time)">
-        <!-- default setting -->
-        <cs:var name="cook_time" expr="5"/>
-      </if>
-      <!-- again, door_closed should be a part of a global context -->
-      <if cond="empty(door_closed)">
-        <!-- default setting -->
-        <cs:var name="door_closed" expr="true"/>
-      </if>
-      <!-- timer variable -->
-      <cs:var name="timer" expr="0"/>
-    </onentry>
-
-    <transition event="turn_off" target="off"/>
-
-    <transition cond="timer ge cook_time" target="off"/>
-
-    <state id="idle">
-      <!-- default immediate transition -->
-      <transition cond="door_closed" target="cooking"/>
-
-      <!-- start cooking -->
-      <transition event="door_close" target="cooking">
-        <assign name="door_closed" expr="true"/>
-      </transition>
-    </state>
-
-    <state id="cooking">
-      <transition event="door_open" target="idle">
-        <assign name="door_closed" expr="false"/>
-      </transition> 
-      <transition event="time" target="cooking">
-        <assign name="timer" expr="timer + 1"/>
-      </transition>
-    </state>
-
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/microwave-04.xml b/test/samples/apache/microwave-04.xml
deleted file mode 100644
index 96656dd..0000000
--- a/test/samples/apache/microwave-04.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses Commons JEXL as the expressions language.
-   Needs SCXMLParser.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="microwave">
-
-  <!--  trivial microwave oven example -->
-  <!-- using parallel and In() predicate -->
-
-  <parallel id="microwave">
-
-      <state id="oven">
-        <initial>
-          <transition target="off"/>
-        </initial>
-
-        <state id="off">
-          <!-- off state -->
-          <transition event="turn_on" target="on"/>
-        </state>
-        
-        <state id="on">
-          <initial>
-            <transition target="idle"/>
-          </initial>
-
-          <!-- on/pause state -->
-          <onentry>
-            <!-- we assume the cook_time is passed in as a context parameter -->
-            <if cond="empty(cook_time)">
-              <!-- default setting, note namespace of this custom action -->
-              <cs:var name="cook_time" expr="5"/>
-            </if>
-            <!-- timer variable -->
-            <cs:var name="timer" expr="0"/>
-          </onentry>
-          
-          <transition event="turn_off" target="off"/>
-
-          <transition cond="timer ge cook_time" target="off"/>
-          
-          <state id="idle">
-            <transition cond="In('closed')" target="cooking"/>
-          </state>
-          
-          <state id="cooking">
-            <transition cond="not In('closed')" target="idle"/>
-
-            <transition event="time" target="cooking">
-              <assign name="timer" expr="timer + 1"/>
-            </transition>
-          </state>
-        </state>
-      </state>
-
-      <state id="door">
-        <initial>
-          <transition target="closed"/>
-        </initial>
-        <state id="closed">
-          <transition event="door_open" target="open"/>
-        </state>
-        <state id="open">
-          <transition event="door_close" target="closed"/>
-        </state>
-      </state>
-
-  </parallel>
-
-</scxml>
diff --git a/test/samples/apache/microwave-05.xml b/test/samples/apache/microwave-05.xml
deleted file mode 100644
index 06b9fc9..0000000
--- a/test/samples/apache/microwave-05.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   This document uses Commons JEXL as the expressions language.
-   Needs SCXMLParser.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="microwave">
-
-  <!--  trivial microwave oven example -->
-  <!-- using parallel (part of composite state) and In() predicate -->
-
-  <state id="microwave">
-
-    <initial>
-      <transition target="parts"/>
-    </initial>
-
-    <parallel id="parts">
-
-      <state id="oven">
-        <initial>
-          <transition target="off"/>
-        </initial>
-
-        <state id="off">
-          <!-- off state -->
-          <transition event="turn_on" target="on"/>
-        </state>
-        
-        <state id="on">
-          <initial>
-            <transition target="idle"/>
-          </initial>
-
-          <!-- on/pause state -->
-          <onentry>
-            <!-- we assume the cook_time is passed in as a context parameter -->
-            <if cond="empty(cook_time)">
-              <!-- default setting, note namespace of this custom action -->
-              <cs:var name="cook_time" expr="5"/>
-            </if>
-            <!-- timer variable -->
-            <cs:var name="timer" expr="0"/>
-          </onentry>
-          
-          <transition event="turn_off" target="off"/>
-
-          <transition cond="timer ge cook_time" target="off"/>
-          
-          <state id="idle">
-            <transition cond="In('closed')" target="cooking"/>
-          </state>
-          
-          <state id="cooking">
-            <transition cond="not In('closed')" target="idle"/>
-
-            <transition event="time" target="cooking">
-              <assign name="timer" expr="timer + 1"/>
-            </transition>
-          </state>
-        </state>
-      </state>
-
-      <state id="door">
-        <initial>
-          <transition target="closed"/>
-        </initial>
-        <state id="closed">
-          <transition event="door_open" target="open"/>
-        </state>
-        <state id="open">
-          <transition event="door_close" target="closed"/>
-        </state>
-      </state>
-
-    </parallel>
-
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/parallel-01.xml b/test/samples/apache/parallel-01.xml
deleted file mode 100644
index e822285..0000000
--- a/test/samples/apache/parallel-01.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-    Needs SCXMLParser
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="para">
-
-    <parallel id="para">
-
-        <state id="para1">
-
-            <initial>
-                <transition target="para11"/>
-            </initial>
-
-            <state id="para11">
-                <transition event="foo" target="para12"/>
-            </state>
-
-            <state id="para12">
-                <onexit>
-                    <log expr="'Exiting para12'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <state id="para2">
-
-            <initial>
-                <transition target="para21"/>
-            </initial>
-
-            <state id="para21">
-                <transition cond="In('para12')" target="para22"/>
-            </state>
-
-            <state id="para22">
-                <onexit>
-                    <log expr="'Exiting para22'" />
-                </onexit>
-
-                <transition target="end"/>
-            </state>
-
-        </state>
-
-    </parallel>
-
-    <state id="end" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/parallel-02.xml b/test/samples/apache/parallel-02.xml
deleted file mode 100644
index 106fc86..0000000
--- a/test/samples/apache/parallel-02.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-   Needs SCXMLParser
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="state0">
-
-    <parallel id="state0">
-        <transition event="event1" target="state1" />
-        <!-- dummy regions -->
-        <state id="state01"/>
-        <state id="state02"/>
-    </parallel>
-    <final id="state1"/>
-
-</scxml>
diff --git a/test/samples/apache/parallel-03.xml b/test/samples/apache/parallel-03.xml
deleted file mode 100644
index d57196a..0000000
--- a/test/samples/apache/parallel-03.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-    Needs SCXMLParser
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initial="para">
-
-    <datamodel>
-        <data id="root">
-            <root xmlns="">
-                <count>0</count>
-            </root>
-        </data>
-    </datamodel>
-
-    <parallel id="para">
-
-        <onentry>
-            <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-        </onentry>
-
-        <state id="para1">
-
-            <initial>
-                <transition target="para11"/>
-            </initial>
-            <onentry>
-                <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-            </onentry>
-
-            <state id="para11">
-                <onentry>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onentry>
-                <transition event="foo" target="para12"/>
-                <onexit>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onexit>
-            </state>
-
-            <final id="para12">
-                <onentry>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onentry>
-                <onexit>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onexit>
-            </final>
-
-            <onexit>
-                <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-            </onexit>
-
-        </state>
-
-        <state id="para2">
-
-            <initial>
-                <transition target="para21"/>
-            </initial>
-            <onentry>
-                <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-            </onentry>
-
-            <state id="para21">
-                <onentry>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onentry>
-                <transition event="bar" target="para22"/>
-                <onexit>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onexit>
-            </state>
-
-            <final id="para22">
-                <onentry>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onentry>
-                <onexit>
-                    <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-                </onexit>
-            </final>
-
-            <onexit>
-                <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-            </onexit>
-
-        </state>
-
-        <transition event="para.done" target="end"/>
-
-        <onexit>
-            <assign location="Data(root, 'root/count')" expr="Data(root, 'root/count') + 1"/>
-        </onexit>
-
-    </parallel>
-
-    <state id="end" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/prefix-01.xml b/test/samples/apache/prefix-01.xml
deleted file mode 100644
index 79cbe69..0000000
--- a/test/samples/apache/prefix-01.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml:scxml xmlns:scxml="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <scxml:state id="ten">
-        <scxml:transition event="ten.done" target="twenty"/>
-    </scxml:state>
-
-    <scxml:state id="twenty" final="true" />
-
-</scxml:scxml>
-
diff --git a/test/samples/apache/scxml-initial-attr.xml b/test/samples/apache/scxml-initial-attr.xml
deleted file mode 100644
index 0965653..0000000
--- a/test/samples/apache/scxml-initial-attr.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initial="foo">
-
-    <final id="foo"/>
-
-</scxml>
diff --git a/test/samples/apache/send-01.xml b/test/samples/apache/send-01.xml
deleted file mode 100644
index 4f3cf40..0000000
--- a/test/samples/apache/send-01.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-        <transition event="ten.done" target="twenty">
-            <send sendid="send1" delay="'0'"
-             target="'http://localhost:8080/VXMLInterpreter'" type="'v3'"
-             xmlns:v3="http://foo.bar.com/vxml3"
-             xmlns:test="http://my.test.namespace">
-                <v3:form id="Confirm">
-                    <v3:grammar type="application/srgs+xml"
-                                src="/grammars/boolean.grxml"/>
-                    <v3:block>
-                        <v3:prompt>Say yes or no.</v3:prompt>
-                    </v3:block>
-                </v3:form>
-                <test:foo id="foo1">
-                    <test:bar id="bar1" />
-                </test:foo>
-                <test:foo id="foo2">
-                    <v3:prompt>This is just an example.</v3:prompt>
-                </test:foo>
-            </send>
-        </transition>
-    </state>
-
-    <state id="twenty" final="true" />
-
-</scxml>
diff --git a/test/samples/apache/send-02.xml b/test/samples/apache/send-02.xml
deleted file mode 100644
index 9685385..0000000
--- a/test/samples/apache/send-02.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Various send usages that fire the events on the existing execution
-     engine. -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <!-- We are expected to just fall all the way through down to
-         the state "seventy", then hop over and end up in "ninety" -->
-    <state id="ten">
-        <onentry>
-            <send event="'ten.' + 'done'" />
-        </onentry>
-        <transition event="ten.done" target="twenty" />
-    </state>
-
-    <state id="twenty">
-        <onentry>
-            <send event="'twenty.done'" type="'scxml'" />
-        </onentry>
-        <transition event="twenty.done" target="thirty" />
-    </state>
-
-    <state id="thirty">
-        <onentry>
-            <send event="'thirty.done'" type="' sCxML  '" />
-        </onentry>
-        <transition event="thirty.done" target="forty" />
-    </state>
-
-    <state id="forty">
-        <onentry>
-            <send event="'forty.done'" type=" " target=" " />
-        </onentry>
-        <transition event="forty.done" target="fifty" />
-    </state>
-
-    <state id="fifty">
-        <onentry>
-            <send event="'fifty.done'" target="'  '" />
-        </onentry>
-        <transition event="fifty.done" target="sixty" />
-    </state>
-
-    <state id="sixty">
-        <onentry>
-            <send event="'sixty.done'" type="'scxml'" target=" " />
-        </onentry>
-        <transition event="sixty.done" target="seventy" />
-    </state>
-
-    <state id="seventy">
-        <onentry>
-            <send event="'seventy.done'" type="'scxml'" target="'foo'" />
-        </onentry>
-
-        <!-- This transition should not be followed since
-             target "foo" is unavailable (any target other
-             than an empty target is unavailable, empty target
-             is current execution i.e. this state machine) -->
-        <transition event="seventy.done" target="eighty" />
-
-        <!-- Since "foo" it not available, the event
-             "error.send.targetunavailable" should be raised -->
-        <transition event="error.send.targetunavailable" target="ninety" />
-
-    </state>
-
-    <state id="eighty" final="true" />
-
-    <state id="ninety" final="true" />
-
-</scxml>
diff --git a/test/samples/apache/src-test-1.xml b/test/samples/apache/src-test-1.xml
deleted file mode 100644
index 74e6ce2..0000000
--- a/test/samples/apache/src-test-1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="srctest1">
-
-    <state id="srctest1" src="src-test-2.xml">
-        <transition event="src.test" target="srctest3end"/>
-        <transition event="srctest1.done" target="srctest1end"/>
-    </state>
-
-    <state id="srctest1end" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/src-test-2.xml b/test/samples/apache/src-test-2.xml
deleted file mode 100644
index 16789ab..0000000
--- a/test/samples/apache/src-test-2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="srctest2">
-
-    <state id="srctest2" src="src-test-3.xml">
-        <transition event="srctest2.done" target="srctest2end"/>
-    </state>
-
-    <state id="srctest2end" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/src-test-3.xml b/test/samples/apache/src-test-3.xml
deleted file mode 100644
index d675687..0000000
--- a/test/samples/apache/src-test-3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="srctest3">
-
-    <state id="srctest3"/>
-
-    <state id="srctest3end" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/src-test-4.xml b/test/samples/apache/src-test-4.xml
deleted file mode 100644
index 4fe18e5..0000000
--- a/test/samples/apache/src-test-4.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="srctest1">
-
-    <state id="srctest1" src="bad-document-404.xml">
-        <transition event="srctest1.done" target="srctest1end"/>
-    </state>
-
-    <state id="srctest1end" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/src-test-5.xml b/test/samples/apache/src-test-5.xml
deleted file mode 100644
index a36e112..0000000
--- a/test/samples/apache/src-test-5.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Used for SrcTest.java in io package -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="srctest1">
-
-    <state id="srctest1" src="src-test-3.xml#badstateid404">
-        <transition event="srctest1.done" target="srctest1end"/>
-    </state>
-
-    <state id="srctest1end" final="true"/>
-
-</scxml>
-
diff --git a/test/samples/apache/state-01.xml b/test/samples/apache/state-01.xml
deleted file mode 100644
index 22a9018..0000000
--- a/test/samples/apache/state-01.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="s1">
-
-    <state id="s1" initial="s11">
-        <final id="s11"/>
-    </state>
-
-</scxml>
diff --git a/test/samples/apache/stateless-01.xml b/test/samples/apache/stateless-01.xml
deleted file mode 100644
index 1229b8f..0000000
--- a/test/samples/apache/stateless-01.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="main">
-
-    <state id="main">
-
-        <initial>
-            <transition target="ten"/>
-        </initial>
-
-        <onentry>
-            <var name="instancevar" expr="${20}" />
-        </onentry>
-
-        <state id="ten">
-            <transition event="ten.done" cond="${instancevar eq 20}"
-                        target="twenty" />
-            <onexit>
-                <assign name="instancevar" expr="${30}" />
-            </onexit>
-        </state>
-
-        <state id="twenty">
-            <transition event="twenty.done" cond="${instancevar eq 30}"
-                        target="thirty" />
-        </state>
-
-        <state id="thirty" final="true" />
-
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/stateless-parallel-01.xml b/test/samples/apache/stateless-parallel-01.xml
deleted file mode 100644
index f2e9017..0000000
--- a/test/samples/apache/stateless-parallel-01.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="main">
-
-    <state id="main">
-
-        <parallel id="main.parallel">
-
-            <state id="state1">
-                <initial>
-                    <transition target="state1.init"/>
-                </initial>
-                <state id="state1.init">
-                    <transition event="state1.event" target="state1.final" />
-                </state>
-                <state id="state1.final" final="true" />
-            </state>
-
-            <state id="state2">
-                <initial>
-                    <transition target="state2.init"/>
-                </initial>
-                <state id="state2.init">
-                    <transition event="state2.event" target="state2.final" />
-                </state>
-                <state id="state2.final" final="true" />
-            </state>
-
-        </parallel>
-
-        <transition event="main.parallel.done" target="next" />
-
-    </state>
-
-    <state id="next" final="true"/>
-
-</scxml>
diff --git a/test/samples/apache/static-method.xml b/test/samples/apache/static-method.xml
deleted file mode 100644
index 7ad034a..0000000
--- a/test/samples/apache/static-method.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- Example of invoking a static method when using JEXL, for example:
-     (public static) java.lang.System#currentTimeMillis()
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="static">
-
-    <state id="static" final="true">
-        <onentry>
-            <log expr="'Current time millis: ' + System.currentTimeMillis()" />
-        </onentry>
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/stopwatch.xml b/test/samples/apache/stopwatch.xml
deleted file mode 100644
index 57572a1..0000000
--- a/test/samples/apache/stopwatch.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="reset">
-
-    <state id="reset">
-        <transition event="watch.start"   target="running"/>
-    </state>
-
-    <state id="running">
-        <transition event="watch.split"   target="paused"/>
-        <transition event="watch.stop"    target="stopped"/>
-    </state>
-
-    <state id="paused">
-        <transition event="watch.unsplit" target="running"/>
-        <transition event="watch.stop"    target="stopped"/>
-    </state>
-
-    <state id="stopped">
-        <transition event="watch.reset"   target="reset"/>
-    </state>
-
-</scxml>
-
diff --git a/test/samples/apache/tie-breaker-01.xml b/test/samples/apache/tie-breaker-01.xml
deleted file mode 100644
index 7cff894..0000000
--- a/test/samples/apache/tie-breaker-01.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-  Used by TieBreakerTest
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-    <state id="ten">
-        <!-- twenty should win, document order -->
-        <transition event="ten.done" target="twenty" />
-        <transition event="ten.done" target="thirty" />
-    </state>
-
-    <state id="twenty" final="true" />
-
-    <state id="thirty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/tie-breaker-02.xml b/test/samples/apache/tie-breaker-02.xml
deleted file mode 100644
index 62118dd..0000000
--- a/test/samples/apache/tie-breaker-02.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-  Used by TieBreakerTest
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-        <initial>
-            <transition target="eleven"/>
-        </initial>
-
-        <transition event="ten.done" target="twenty" />
-
-        <state id="eleven">
-            <!-- thirty wins since eleven trumps
-                 ten in the state heirarchy -->
-            <transition event="ten.done" target="thirty" />
-        </state>
-
-    </state>
-
-    <state id="twenty" final="true" />
-
-    <state id="thirty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/tie-breaker-03.xml b/test/samples/apache/tie-breaker-03.xml
deleted file mode 100644
index d850865..0000000
--- a/test/samples/apache/tie-breaker-03.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-  Used by TieBreakerTest
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-        <initial>
-            <transition target="eleven"/>
-        </initial>
-
-        <transition event="ten.done" target="twenty" />
-
-        <transition event="ten.done" target="thirty" />
-
-        <state id="eleven">
-
-            <!-- forty wins due to document order and the fact
-                 that since eleven trumps ten in the state
-                 heirarchy -->
-            <transition event="ten.done" target="forty" />
-
-            <transition event="ten.done" target="fifty" />
-
-        </state>
-
-    </state>
-
-    <state id="twenty" final="true" />
-
-    <state id="thirty" final="true" />
-
-    <state id="forty" final="true" />
-
-    <state id="fifty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/tie-breaker-04.xml b/test/samples/apache/tie-breaker-04.xml
deleted file mode 100644
index df87e63..0000000
--- a/test/samples/apache/tie-breaker-04.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="s1"> 
-     
-    <state id="s1"> 
-        <initial> 
-            <transition target="s11"/> 
-        </initial> 
-         
-        <transition event="event_1"/>
-        
-        <transition event="event_2" target="s1"/>
-         
-        <state id="s11"> 
-            <transition event="event_1"/>
-            <transition event="event_2" target="s11"/>
-        </state> 
-    </state> 
-     
-    <state id="s2" final="true" /> 
-</scxml> 
diff --git a/test/samples/apache/tie-breaker-05.xml b/test/samples/apache/tie-breaker-05.xml
deleted file mode 100644
index 1fcbd35..0000000
--- a/test/samples/apache/tie-breaker-05.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="para">
-
-<!-- 
-  Testing dispute resolution in regions
-  {s11,s2111,s212} -event1-> {s12,s2112,s212}
--->
-
-    <parallel id="para"> <!-- Outer parallel -->
-
-        <state id="s1">
-            <initial>
-                <transition target="s11"/>
-            </initial>
-            <state id="s11">
-                <transition event="event1" target="s12"/>
-                <transition event="event1" target="s13"/>
-            </state>
-            <state id="s12"/>
-            <state id="s13"/>
-        </state>
-
-        <state id="s2">
-            <initial>
-                <transition target="para1"/>
-            </initial>
-
-            <parallel id="para1"> <!-- Inner parallel -->
-                <state id="s211">
-                    <initial>
-                        <transition target="s2111"/>
-                    </initial>
-                    <state id="s2111">
-                        <transition event="event1" target="s2112"/>
-                        <transition event="event1" target="s2113"/>
-                    </state>
-                    <state id="s2112"/>
-                    <state id="s2113"/>
-                </state>
-                <state id="s212"/>                                          
-            </parallel>
-
-            <state id="s22"/>
-        </state>
-
-    </parallel>
-
-</scxml>
diff --git a/test/samples/apache/tie-breaker-06.xml b/test/samples/apache/tie-breaker-06.xml
deleted file mode 100644
index a7f26ff..0000000
--- a/test/samples/apache/tie-breaker-06.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!-- A fictitious state machine used by test cases.
-     <send>s in the same executable content block -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initialstate="main">
-
-  <state id="main">
-
-    <onentry>
-      <event name="internal_event1"/>
-      <event name="internal_event2"/>
-    </onentry>
-
-    <transition event="internal_event1">
-      <log label="Expected"
-           expr="'Transition for first event (internal_event1) followed'"/>
-    </transition>
-    <transition event="internal_event2">
-      <log label="Unexpected"
-           expr="'Transition for second event (internal_event2) followed'"/>
-    </transition>
-
-  </state>
-
-</scxml>
diff --git a/test/samples/apache/transitions-01-legacy.xml b/test/samples/apache/transitions-01-legacy.xml
deleted file mode 100644
index f46bc74..0000000
--- a/test/samples/apache/transitions-01-legacy.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <!-- Start with a simple state -->
-    <state id="ten">
-        <transition event="ten.done" target="twenty" />
-    </state>
-
-    <!-- Follow up with a composite state -->
-    <state id="twenty">
-
-        <initial>
-            <transition target="twenty_one"/>
-        </initial>
-
-        <onentry>
-            <log expr="'In twenty'" />
-        </onentry>
-
-        <state id="twenty_one">
-            <transition event="twenty_one.done" target="twenty_two"/>
-        </state>
-
-        <state id="twenty_two">
-            <transition event="twenty_two.done" target="thirty"/>
-        </state>
-
-    </state>
-
-    <!-- Finally, try an orthogonal state -->
-    <state id="thirty">
-
-        <parallel id="thirties_parallel">
-
-            <!-- The first (of three) regions in thirties_parallel -->
-            <state id="thirty_one">
-
-                <initial>
-                    <transition target="thirty_one_child_one"/>
-                </initial>
-                <onentry>
-                    <log expr="'Entering thirty_one'" />
-                </onentry>
-                <transition event="thirty_one.done" target="forty"/>
-
-                <state id="thirty_one_child_one">
-                    <onexit>
-                        <log expr="'Exiting thirty_one_child_one'" />
-                    </onexit>
-                    <transition event="thirty_one_child_one.done"
-                                target="thirty_one_child_two"/>
-                </state>
-
-                <state id="thirty_one_child_two">
-                    <onexit>
-                        <log expr="'Exiting thirty_one_child_two'" />
-                    </onexit>
-                </state>
-
-            </state>
-
-            <!-- The second (of three) regions in thirties_parallel -->
-            <state id="thirty_two">
-
-                <initial>
-                    <transition target="thirty_two_child_one"/>
-                </initial>
-                <onentry>
-                    <log expr="'Entering thirty_two'" />
-                </onentry>
-
-                <state id="thirty_two_child_one">
-                    <onexit>
-                        <log expr="'Exiting thirty_two_child_one'" />
-                    </onexit>
-                    <transition event="thirty_two_child_one.done"
-                                target="thirty_two_child_two"/>
-                </state>
-
-                <state id="thirty_two_child_two">
-                    <onexit>
-                        <log expr="'Exiting thirty_two_child_two'" />
-                    </onexit>
-                </state>
-
-            </state>
-
-            <!-- The third (of three) regions in thirties_parallel -->
-            <state id="thirty_three">
-
-                <initial>
-                    <transition target="thirty_three_child_one"/>
-                </initial>
-                <onentry>
-                    <log expr="'Entering thirty_three'" />
-                </onentry>
-
-                <state id="thirty_three_child_one">
-                    <onexit>
-                        <log expr="'Exiting thirty_three_child_one'" />
-                    </onexit>
-                    <transition event="thirty_three_child_one.done"
-                                target="thirty_three_child_two"/>
-                </state>
-
-                <state id="thirty_three_child_two">
-                    <onexit>
-                        <log expr="'Exiting thirty_three_child_two'" />
-                    </onexit>
-                </state>
-
-            </state>
-
-        </parallel>
-
-    </state>
-
-    <!-- Declare victory -->
-    <state id="forty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/transitions-01.xml b/test/samples/apache/transitions-01.xml
deleted file mode 100644
index ee5133f..0000000
--- a/test/samples/apache/transitions-01.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml
-       version="1.0"
-       initial="ten">
-
-    <!-- Start with a simple state -->
-    <state id="ten">
-        <transition event="ten.done" target="twenty" />
-    </state>
-
-    <!-- Follow up with a composite state -->
-    <state id="twenty">
-
-        <initial>
-            <transition target="twenty_one"/>
-        </initial>
-
-        <onentry>
-            <log expr="'In twenty'" />
-        </onentry>
-
-        <state id="twenty_one">
-            <transition event="twenty_one.done" target="twenty_two"/>
-        </state>
-
-        <state id="twenty_two">
-            <transition event="twenty_two.done" target="thirty"/>
-        </state>
-
-    </state>
-
-    <!-- Finally, try an orthogonal state -->
-    <parallel id="thirty">
-
-        <!-- The first (of three) regions in thirties_parallel -->
-        <state id="thirty_one">
-
-            <initial>
-                <transition target="thirty_one_child_one"/>
-            </initial>
-            <onentry>
-                <log expr="'Entering thirty_one'" />
-            </onentry>
-            <transition event="thirty_one.done" target="forty"/>
-
-            <state id="thirty_one_child_one">
-                <onexit>
-                    <log expr="'Exiting thirty_one_child_one'" />
-                </onexit>
-                <transition event="thirty_one_child_one.done"
-                            target="thirty_one_child_two"/>
-            </state>
-
-            <state id="thirty_one_child_two">
-                <onexit>
-                    <log expr="'Exiting thirty_one_child_two'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <!-- The second (of three) regions in thirties_parallel -->
-        <state id="thirty_two">
-
-            <initial>
-                <transition target="thirty_two_child_one"/>
-            </initial>
-            <onentry>
-                <log expr="'Entering thirty_two'" />
-            </onentry>
-
-            <state id="thirty_two_child_one">
-                <onexit>
-                    <log expr="'Exiting thirty_two_child_one'" />
-                </onexit>
-                <transition event="thirty_two_child_one.done"
-                            target="thirty_two_child_two"/>
-            </state>
-
-            <state id="thirty_two_child_two">
-                <onexit>
-                    <log expr="'Exiting thirty_two_child_two'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <!-- The third (of three) regions in thirties_parallel -->
-        <state id="thirty_three">
-
-            <initial>
-                <transition target="thirty_three_child_one"/>
-            </initial>
-            <onentry>
-                <log expr="'Entering thirty_three'" />
-            </onentry>
-
-            <state id="thirty_three_child_one">
-                <onexit>
-                    <log expr="'Exiting thirty_three_child_one'" />
-                </onexit>
-                <transition event="thirty_three_child_one.done"
-                            target="thirty_three_child_two"/>
-            </state>
-
-            <state id="thirty_three_child_two">
-                <onexit>
-                    <log expr="'Exiting thirty_three_child_two'" />
-                </onexit>
-            </state>
-
-        </state>
-
-    </parallel>
-
-    <!-- Declare victory -->
-    <state id="forty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/transitions-02.xml b/test/samples/apache/transitions-02.xml
deleted file mode 100644
index 7c1dcf5..0000000
--- a/test/samples/apache/transitions-02.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-
-        <onentry>
-            <cs:var name="foo" expr="1" />
-            <log expr="'Foo is:' + foo" />
-        </onentry>
-
-        <!-- stay transition -->
-        <transition event="ten.stay">
-            <assign name="foo" expr="foo + 1" />
-            <log expr="'Foo is:' + foo" />
-        </transition>
-
-        <!-- self transition -->
-        <transition event="ten.self" target="ten">
-            <assign name="foo" expr="foo + 1" />
-            <log expr="'Foo is:' + foo" />
-        </transition>
-
-        <!-- "regular" transition -->
-        <transition event="ten.done" target="twenty">
-            <assign name="foo" expr="foo + 1" />
-            <log expr="'Foo is:' + foo" />
-        </transition>
-
-    </state>
-
-    <state id="twenty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/transitions-03.xml b/test/samples/apache/transitions-03.xml
deleted file mode 100644
index 303d673..0000000
--- a/test/samples/apache/transitions-03.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-        <transition event="ten.done"
-         target="twenty_one_2 twenty_two_2 twenty_three_2" />
-    </state>
-
-    <parallel id="twenty">
-
-        <state id="twenty_one">
-
-            <initial>
-                <transition target="twenty_one_1"/>
-            </initial>
-
-            <state id="twenty_one_1">
-                <transition event="foo" target="twenty_one_2"/>
-            </state>
-
-            <state id="twenty_one_2">
-                <onexit>
-                    <log expr="'Exiting twenty_two_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <state id="twenty_two">
-
-            <initial>
-                <transition target="twenty_two_1"/>
-            </initial>
-
-            <state id="twenty_two_1">
-                <transition event="foo" target="twenty_two_2"/>
-            </state>
-
-            <state id="twenty_two_2">
-                <onexit>
-                    <log expr="'Exiting twenty_two_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <state id="twenty_three">
-
-            <initial>
-                <transition target="twenty_three_1"/>
-            </initial>
-
-            <state id="twenty_three_1">
-                <transition event="foo" target="twenty_three_2"/>
-            </state>
-
-            <state id="twenty_three_2">
-                <onexit>
-                    <log expr="'Exiting twenty_three_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-    </parallel>
-
-    <state id="thirty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/transitions-04.xml b/test/samples/apache/transitions-04.xml
deleted file mode 100644
index 547b702..0000000
--- a/test/samples/apache/transitions-04.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<!--
-    Needs SCXMLParser
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       version="1.0"
-       initialstate="ten">
-
-    <state id="ten">
-        <transition event="ten.done"
-         target="twenty" />
-    </state>
-
-    <parallel id="twenty">
-
-        <state id="twenty_one">
-
-            <initial>
-                <transition target="twenty_one_1"/>
-            </initial>
-
-            <transition event="bar" target="thirty"/>
-
-            <state id="twenty_one_1">
-                <transition event="foo" target="twenty_one_2"/>
-            </state>
-
-            <state id="twenty_one_2">
-                <onexit>
-                    <log expr="'Exiting twenty_two_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <state id="twenty_two">
-
-            <initial>
-                <transition target="twenty_two_1"/>
-            </initial>
-
-            <state id="twenty_two_1">
-                <transition event="foo" target="twenty_two_2"/>
-            </state>
-
-            <state id="twenty_two_2">
-                <onexit>
-                    <log expr="'Exiting twenty_two_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-        <state id="twenty_three">
-
-            <initial>
-                <transition target="twenty_three_1"/>
-            </initial>
-
-            <state id="twenty_three_1">
-                <transition event="foo" target="twenty_three_2"/>
-            </state>
-
-            <state id="twenty_three_2">
-                <onexit>
-                    <log expr="'Exiting twenty_three_2'" />
-                </onexit>
-            </state>
-
-        </state>
-
-    </parallel>
-
-    <state id="thirty" final="true" />
-
-</scxml>
-
diff --git a/test/samples/apache/transitions-05.xml b/test/samples/apache/transitions-05.xml
deleted file mode 100644
index 7400359..0000000
--- a/test/samples/apache/transitions-05.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" initial="init">
-       <state id="init">
-               <transition event="start" target="onetwo" />
-       </state>
-       <parallel id="onetwo">
-               <transition event="onetwo_three" target="three" />
-               <state id="one">
-               </state>
-               <state id="two">
-                       <transition event="two_four" target="four" />
-               </state>
-       </parallel>
-       <state id="three">
-               <transition event="three_one" target="one" />
-               <transition event="three_four" target="four" />
-       </state>
-       <state id="four">
-               <transition event="four_onetwo" target="onetwo" />
-               <transition event="four_three" target="three" />
-       </state>
-</scxml>
diff --git a/test/samples/apache/travel-dialog.xml b/test/samples/apache/travel-dialog.xml
deleted file mode 100644
index 08ebc99..0000000
--- a/test/samples/apache/travel-dialog.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml              xmlns="http://www.w3.org/2005/01/SCXML"
-                  version="1.0" 
-             initialstate="tripType">
-
-  <state               id="tripType">
-    <transition     event="tripType.done">
-      <target        next="departureCity"/>
-    </transition>
-  </state>
-
-  <state               id="departureCity">
-    <transition     event="departureCity.done">
-      <target        next="arrivalCity"/>
-    </transition>
-  </state>
-
-  <state               id="arrivalCity">
-    <transition     event="arrivalCity.done">
-      <target        next="departureDate"/>
-    </transition>
-  </state>
-
-  <state               id="departureDate">
-    <transition     event="departureDate.done"
-                     cond="${tripType == 'round'}">
-      <target        next="arrivalDate"/>
-    </transition>
-    <transition     event="departureDate.done"
-                     cond="${tripType == '1way'}">
-      <exit />
-    </transition>
-  </state>
-
-  <state               id="arrivalDate"
-                    final="true" />
-
-</scxml>
diff --git a/test/samples/apache/wildcard-01.xml b/test/samples/apache/wildcard-01.xml
deleted file mode 100644
index 9f7ddc3..0000000
--- a/test/samples/apache/wildcard-01.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-       xmlns:cs="http://commons.apache.org/scxml"
-       version="1.0"
-       initialstate="state1">
-     <state id="state1">
-           <onentry>
-               <cs:var name="switch" expr="4" />
-           </onentry>
-           <!-- We'll trigger 'foo.bar.baz' event,
-                and therefore, must end up in state4 -->
-           <transition event="*" cond="switch eq 2" target="state2"/>
-           <transition event="foo.*" cond="switch eq 3" target="state3"/>
-           <transition event="foo.bar.*" cond="switch eq 4" target="state4"/>
-     </state>
-     <state id="state2" final="true"/>
-     <state id="state3" final="true"/>
-     <state id="state4" final="true"/>
-</scxml>
diff --git a/test/samples/apache/wildcard-02.xml b/test/samples/apache/wildcard-02.xml
deleted file mode 100644
index d039f69..0000000
--- a/test/samples/apache/wildcard-02.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-      version="1.0"
-      initialstate="state1">
-
-    <state id="state1">
-      <onentry>
-        <event name="success.start"/>
-      </onentry>
-      <transition event="success.*" target="state2"/>
-    </state>
-
-    <state id="state2"/>
-
-</scxml>
-
diff --git a/test/samples/apache/wizard-01.xml b/test/samples/apache/wizard-01.xml
deleted file mode 100644
index 87492a6..0000000
--- a/test/samples/apache/wizard-01.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-      version="1.0"
-      initialstate="state1">
-     <state id="state1">
-           <transition event="event2" target="state2"/>
-           <transition event="event3" target="state3"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state2">
-           <transition event="event1" target="state1"/>
-           <transition event="event3" target="state3"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state3">
-           <transition event="event1" target="state1"/>
-           <transition event="event2" target="state2"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state4">
-           <transition event="event1" target="state1"/>
-           <transition event="event2" target="state2"/>
-           <transition event="event3" target="state3"/>
-     </state>
-</scxml>
diff --git a/test/samples/apache/wizard-02.xml b/test/samples/apache/wizard-02.xml
deleted file mode 100644
index 924b83f..0000000
--- a/test/samples/apache/wizard-02.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-<scxml xmlns="http://www.w3.org/2005/07/scxml"
-      version="1.0"
-      initialstate="state1">
-     <state id="state1">
-           <onentry>
-                 <!-- Send without a type causes the
-                      default to be chosen as "scxml".
-                      This will cause the first transition
-                      to state2 to be immediately followed. -->
-                 <send event="'event2'" />
-           </onentry>
-           <transition event="event2" target="state2"/>
-           <transition event="event3" target="state3"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state2">
-           <onentry>
-                 <var name="aValue" expr="2"/>
-                 <!-- Send with a non-empty (and not "scxml")
-                      type causes the callback on the
-                      EventDispatcher implementation. See
-                      testWizard02Sample() in WizardsTest
-                      (org.apache.commons.scxml test package) -->
-                 <send namelist="aValue" type="'foo'" />
-           </onentry>
-           <transition event="event1" target="state1"/>
-           <transition event="event3" target="state3"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state3">
-           <onentry>
-                 <var name="aValue" expr="3"/>
-                 <send namelist="aValue" type="'foo'" />
-           </onentry>
-           <transition event="event1" target="state1"/>
-           <transition event="event2" target="state2"/>
-           <transition event="event4" target="state4"/>
-     </state>
-     <state id="state4">
-           <onentry>
-                 <var name="aValue" expr="4"/>
-                 <send namelist="aValue" type="'foo'" />
-           </onentry>
-           <transition event="event1" target="state1"/>
-           <transition event="event2" target="state2"/>
-           <transition event="event3" target="state3"/>
-     </state>
-</scxml>
\ No newline at end of file
diff --git a/test/samples/uscxml/promela/test-simple-promela.scxml b/test/samples/uscxml/promela/test-simple-promela.scxml
deleted file mode 100644
index 00b95e4..0000000
--- a/test/samples/uscxml/promela/test-simple-promela.scxml
+++ /dev/null
@@ -1,55 +0,0 @@
-<scxml datamodel="promela">
-  <datamodel>
-    <data>
-      bool b1;
-    </data>
-    <data>
-      bool b2, b3, b4;
-    </data>
-    <data>
-      bool b5, b6 = 3 + 4, b7, b8, b9;
-    </data>
-    <data>
-      bool c1; bool c2; bool c3; bool c4;
-      bool c5; bool c6; bool c7, c8 = 4 + 6, c9;
-    </data>
-    <data>
-      byte state = 1;
-      mtype = {
-        FATAL, NON_FATAL, COMPLETE, INCOMPLETE,
-        red, white, blue
-      }
-    </data>
-    <data>
-      bool busy[3], lazy[4 + 5];
-    </data>
-    <data>
-      bool v3, v2 = 1;
-    </data>
-    
-  </datamodel>
-  <state id="init">
-    <onentry>
-      <script>
-        busy[4 - 3] = 1;
-      </script>
-      <log expr="busy" />
-      <script>
-        v2=1; v3=1;
-      </script>
-    </onentry>
-    <transition target="pass" cond="v2==v3 &amp;&amp; busy[1] == 1">
-    </transition>
-    <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/schema/scxml-attribs.xsd b/test/schema/scxml-attribs.xsd
deleted file mode 100644
index 98aff4c..0000000
--- a/test/schema/scxml-attribs.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-	<xsd:annotation>
-		<xsd:documentation>
-		This is the XML Schema common attributes for SCXML
-		</xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-			This import brings in the XML namespace attributes
-			The module itself does not provide the schemaLocation
-			and expects the driver schema to provide the
-			actual SchemaLocation.
-		  </xsd:documentation>
-		</xsd:annotation>
-	</xsd:import>
-	<xsd:include schemaLocation="scxml-datatypes.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-			This include  brings in the SCXML datatypes.
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-	
-	<xsd:attributeGroup name="Fetchtimeout.attrib">
-		<xsd:annotation>
-			<xsd:documentation>Used in Cache.attribs</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="fetchtimeout" type="Duration.datatype"/>
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="Maxage.attrib">
-		<xsd:annotation>
-			<xsd:documentation>Used in Cache.attribs</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="maxage" type="Integer.datatype"/>
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="Maxstale.attrib">
-		<xsd:annotation>
-			<xsd:documentation>Used in Cache attribs</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="maxstale" type="Integer.datatype"/>
-	</xsd:attributeGroup>
-
-	<xsd:attributeGroup name="Cache.attribs">
-		<xsd:annotation>
-			<xsd:documentation>Cache attributes to control caching behavior</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attributeGroup ref="Fetchtimeout.attrib"/>
-		<xsd:attributeGroup ref="Maxage.attrib"/>
-		<xsd:attributeGroup ref="Maxstale.attrib"/>
-	</xsd:attributeGroup>
-</xsd:schema>
diff --git a/test/schema/scxml-contentmodels.xsd b/test/schema/scxml-contentmodels.xsd
deleted file mode 100644
index 2850c3a..0000000
--- a/test/schema/scxml-contentmodels.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-	<xsd:annotation>
-		<xsd:documentation>
-         XML Schema content models for SCXML
-         * scxml.extra.content 
-         * content
-         * scxml.extra.attribs
-         Defines SCXML shared content models.
-        </xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-	
-	<xsd:attributeGroup name="scxml.extra.attribs">
-		<xsd:annotation>
-			<xsd:documentation>group allowing attributes from other namespaces</xsd:documentation>
-		</xsd:annotation>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:attributeGroup>
-	
-	<xsd:group name="scxml.extra.content">
-		<xsd:annotation>
-			<xsd:documentation>
-				group allowing elements from other namespaces
-                        </xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	
-</xsd:schema>
diff --git a/test/schema/scxml-datatypes.xsd b/test/schema/scxml-datatypes.xsd
deleted file mode 100644
index 7771084..0000000
--- a/test/schema/scxml-datatypes.xsd
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-
-	<xsd:annotation>
-		<xsd:documentation>
-        XML Schema datatypes for SCXML
-
-        Defines containers for the SCXML datatypes, many of these
-        imported from other specifications and standards.
-
-		</xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-
-	<xsd:simpleType name="Exmode.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            Describes the processor execution mode for this document, being
-            either "lax" or "strict".     
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="lax"/>
-			<xsd:enumeration value="strict"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Binding.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            The binding type in use for the SCXML document.     
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="early"/>
-			<xsd:enumeration value="late"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-
-	<xsd:simpleType name="HistoryType.datatype">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="shallow"/>
-			<xsd:enumeration value="deep"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="TransitionType.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            The type of the transition i.e. internal or external. 
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="internal"/>
-			<xsd:enumeration value="external"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Boolean.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            Boolean: true or false only
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKENS">
-			<xsd:enumeration value="true"/>
-			<xsd:enumeration value="false"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="AssignType.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            The assign type that allows for precise manipulation of the
-            datamodel location. Types are:
-                 replacechildren (default),
-                 firstchild, lastchild,
-                 previoussibling, nextsibling,
-                 replace, delete,
-                 addattribute
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:NMTOKEN">
-			<xsd:enumeration value="replacechildren"/>
-			<xsd:enumeration value="firstchild"/>
-			<xsd:enumeration value="lastchild"/>
-			<xsd:enumeration value="previoussibling"/>
-			<xsd:enumeration value="nextsibling"/>
-			<xsd:enumeration value="replace"/>
-			<xsd:enumeration value="delete"/>
-			<xsd:enumeration value="addattribute"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="URI.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            The xsd:anyURI type and thus URI references in SCXML
-            documents may contain a wide array of international
-            characters. Implementers should reference RFC 3987 and
-            the "Character Model for the World Wide Web 1.0:
-            Resource Identifiers" in order to provide appropriate
-            support for these characters in VoiceXML documents and
-            when processing values of this type or mapping them to
-            URIs.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:anyURI"/>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Integer.datatype">
-		<xsd:annotation>
-			<xsd:documentation>Non-negative integer</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:nonNegativeInteger"/>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="Duration.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            Duration allowing positive values ranging from milliseconds
-            to days. 
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="\d*(\.\d+)?(ms|s|m|h|d)"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-
-	<xsd:simpleType name="EventType.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-            EventType is the name of an event.
-            Example legal values:
-            	foo
-            	foo.bar
-            	foo.bar.baz
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:token">
-			<xsd:pattern value="(\i|\d|\-)+(\.(\i|\d|\-)+)*"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="EventTypes.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-			Custom datatype for the event attribute in SCXML based on xsd:token.
-			Example legal values:
-				*
-				foo
-				foo.bar
-				foo.*
-				foo.bar.*
-				foo bar baz
-				foo.bar bar.* baz.foo.*
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:token">
-			<xsd:pattern value="\.?\*|(\i|\d|\-)+(\.(\i|\d|\-)+)*(\.\*)?(\s(\i|\d|\-)+(\.(\i|\d|\-)+)*(\.\*)?)*"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<!-- Defines the  default CondLang datatype.        -->
-	<xsd:simpleType name="CondLang.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-		    Conditional language is expression 
-		    which must evaluate to Boolean True or False. 
-		    The expression language must define In(stateID) 
-		    as a valid expression.
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-
-	<!-- Defines the  default LocLang datatype.         -->
-	<xsd:simpleType name="LocLang.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-	        Location language is expression
-		    identifying a location in the datamodel.  
-	        </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-
-	<!-- Defines the default ValueLang datatype.       -->
-	<xsd:simpleType name="ValueLang.datatype">
-		<xsd:annotation>
-			<xsd:documentation>
-		    Value language is expression
-		    return a value.
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-</xsd:schema>
diff --git a/test/schema/scxml-module-core.xsd b/test/schema/scxml-module-core.xsd
deleted file mode 100644
index 5245bc9..0000000
--- a/test/schema/scxml-module-core.xsd
+++ /dev/null
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-	<xsd:annotation>
-		<xsd:documentation>
-        This is the XML Schema core module for SCXML
-        * scxml
-        * state 
-        * initial 
-        * onexit
-        * onentry 
-        * transition
-        * parallel
-        * final 
-        * history 
-        * donedata
-        * if
-        * elsif
-        * else
-        * foreach
-        * raise
-        * log
-        The core module defines these elements and the
-        attributes.
-        </xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-
-	<xsd:include schemaLocation="scxml-datatypes.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            Includes common SCXML datatypes
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-attribs.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            Includes common SCXML attributes
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-contentmodels.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            This module defines Common content model extensions  for SCXML
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-	
-
-	<!-- scxml -->
-	<xsd:attributeGroup name="scxml.scxml.attlist">
-		<xsd:attribute name="initial" type="xsd:IDREFS"/>
-		<xsd:attribute name="name" type="xsd:NMTOKEN"/>
-		<xsd:attribute name="version" type="xsd:decimal" use="required" fixed="1.0"/>
-		<xsd:attribute name="datamodel" type="xsd:NMTOKEN" default="null" use="optional"/>
-		<xsd:attribute name="binding" type="Binding.datatype"/>
-		<xsd:attribute name="exmode" type="Exmode.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.scxml.mix">
-		<xsd:choice>
-			<xsd:element ref="state" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="parallel" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="final" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="datamodel" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="script" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.scxml.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.scxml.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.scxml.type">
-		<xsd:group ref="scxml.scxml.content"/>
-		<xsd:attributeGroup ref="scxml.scxml.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="scxml" type="scxml.scxml.type"/>
-
-	<!-- state -->
-	<xsd:attributeGroup name="scxml.state.attlist">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="initial" type="xsd:IDREFS"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.state.mix">
-		<xsd:choice>
-			<xsd:element ref="onentry" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="onexit" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="transition" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="initial" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="state" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="parallel" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="final" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="history" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="datamodel" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="invoke" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.state.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.state.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.state.type">
-		<xsd:sequence>
-			<xsd:group ref="scxml.state.content"/>
-		</xsd:sequence>
-		<xsd:attributeGroup ref="scxml.state.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="state" type="scxml.state.type"/>
-
-	<!-- initial -->
-	<xsd:attributeGroup name="scxml.initial.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.initial.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="transition" minOccurs="1" maxOccurs="1"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.initial.type">
-		<xsd:group ref="scxml.initial.content"/>
-		<xsd:attributeGroup ref="scxml.initial.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="initial" type="scxml.initial.type"/>
-
-	<!-- onentry -->
-	<xsd:attributeGroup name="scxml.onentry.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.onentry.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.onentry.type">
-		<xsd:group ref="scxml.onentry.content"/>
-		<xsd:attributeGroup ref="scxml.onentry.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="onentry" type="scxml.onentry.type"/>
-
-	<!-- onexit -->
-	<xsd:attributeGroup name="scxml.onexit.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.onexit.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.onexit.type">
-		<xsd:group ref="scxml.onexit.content"/>
-		<xsd:attributeGroup ref="scxml.onexit.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="onexit" type="scxml.onexit.type"/>
-
-	<!-- transition -->
-	<xsd:attributeGroup name="scxml.transition.attlist">
-		<xsd:attribute name="event" type="EventTypes.datatype"/>
-		<xsd:attribute name="cond" type="CondLang.datatype"/>
-		<xsd:attribute name="target" type="xsd:IDREFS"/>
-		<xsd:attribute name="type" type="TransitionType.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.transition.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.transition.type">
-		<xsd:group ref="scxml.transition.content"/>
-		<xsd:attributeGroup ref="scxml.transition.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="transition" type="scxml.transition.type"/>
-
-	<!-- parallel -->
-	<xsd:attributeGroup name="scxml.parallel.attlist">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.parallel.mix">
-		<xsd:choice>
-			<xsd:element ref="onentry" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="onexit" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="transition" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="state" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="parallel" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="history" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="datamodel" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="invoke" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.parallel.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.parallel.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.parallel.type">
-		<xsd:group ref="scxml.parallel.content"/>
-		<xsd:attributeGroup ref="scxml.parallel.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="parallel" type="scxml.parallel.type"/>
-
-	<!-- final -->
-	<xsd:attributeGroup name="scxml.final.attlist">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.final.mix">
-		<xsd:choice>
-			<xsd:element ref="onentry" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="onexit" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="donedata" minOccurs="0" maxOccurs="1"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.final.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.final.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.final.type">
-		<xsd:group ref="scxml.final.content"/>
-		<xsd:attributeGroup ref="scxml.final.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="final" type="scxml.final.type"/>
-
-	<!-- history -->
-	<xsd:attributeGroup name="scxml.history.attlist">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="type" type="HistoryType.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.history.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="transition" minOccurs="1" maxOccurs="1"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.history.type">
-		<xsd:group ref="scxml.history.content"/>
-		<xsd:attributeGroup ref="scxml.history.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="history" type="scxml.history.type"/>
-
-	
-
-	<!-- donedata -->
-	<xsd:attributeGroup name="scxml.donedata.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.donedata.content">
-			<xsd:choice>
-			<xsd:element ref="content" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="param" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:complexType name="scxml.donedata.type">
-		<xsd:group ref="scxml.donedata.content"/>
-		<xsd:attributeGroup ref="scxml.donedata.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="donedata" type="scxml.donedata.type"/>
-	
-		<!-- if -->
-	<xsd:attributeGroup name="scxml.if.attlist">
-		<xsd:attribute name="cond" type="CondLang.datatype" use="required"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.if.elseif.mix">
-		<xsd:sequence>
-			<xsd:element ref="elseif" />
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="scxml.if.else.mix">
-		<xsd:sequence>
-			<xsd:element ref="else" />
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="scxml.if.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.if.elseif.mix" minOccurs="0" maxOccurs="1"/>
-			<xsd:group ref="scxml.if.else.mix" minOccurs="0" maxOccurs="1"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.if.type">
-		<xsd:group ref="scxml.if.content"/>
-		<xsd:attributeGroup ref="scxml.if.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="if" type="scxml.if.type"/>
-
-	<!-- elseif -->
-	<xsd:attributeGroup name="scxml.elseif.attlist">
-		<xsd:attribute name="cond" type="CondLang.datatype" use="required"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.elseif.mix">
-		<xsd:choice>
-			<!-- No content for this element -->
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.elseif.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.elseif.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.elseif.type">
-		<xsd:group ref="scxml.elseif.content"/>
-		<xsd:attributeGroup ref="scxml.elseif.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="elseif" type="scxml.elseif.type"/>
-
-	<!-- else -->
-	<xsd:attributeGroup name="scxml.else.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.else.mix">
-		<xsd:choice>
-			<!-- No content for this element -->
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.else.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.else.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.else.type">
-		<xsd:group ref="scxml.else.content"/>
-		<xsd:attributeGroup ref="scxml.else.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="else" type="scxml.else.type"/>
-
-	<!-- foreach -->
-	<xsd:attributeGroup name="scxml.foreach.attlist">
-		<xsd:attribute name="array" type="ValueLang.datatype" use="required"/>
-		<xsd:attribute name="item" type="xsd:string" use="required"/>
-		<xsd:attribute name="index" type="xsd:string"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.foreach.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.foreach.type">
-		<xsd:group ref="scxml.foreach.content"/>
-		<xsd:attributeGroup ref="scxml.foreach.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="foreach" type="scxml.foreach.type"/>
-
-	<!-- raise -->
-	<xsd:attributeGroup name="scxml.raise.attlist">
-		<xsd:attribute name="event" type="xsd:NMTOKEN" use="required"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.raise.mix">
-		<xsd:choice>
-				<!-- No content for this element -->
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.raise.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.raise.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.raise.type">
-		<xsd:group ref="scxml.raise.content"/>
-		<xsd:attributeGroup ref="scxml.raise.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="raise" type="scxml.raise.type"/>
-
-	<!-- log -->
-	<xsd:attributeGroup name="scxml.log.attlist">
-		<xsd:attribute name="label" type="xsd:string"/>
-		<xsd:attribute name="expr" type="ValueLang.datatype"/>
-	 <xsd:attributeGroup ref="scxml.extra.attribs"/> 
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.log.content">
-		<xsd:sequence>
-		<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/> 
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.log.type">
-		<xsd:group ref="scxml.log.content"/>
-		<xsd:attributeGroup ref="scxml.log.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="log" type="scxml.log.type"/>
-
-	
-</xsd:schema>
diff --git a/test/schema/scxml-module-data.xsd b/test/schema/scxml-module-data.xsd
deleted file mode 100644
index ec96e71..0000000
--- a/test/schema/scxml-module-data.xsd
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-	<xsd:annotation>
-		<xsd:documentation>
-            This is the XML Schema data module for SCXML
-            * datamodel 
-            * data
-            * assign
-            * param
-            * script
-            * content
-            The data module defines these elements and their
-            attributes.
-        </xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-
-	<xsd:include schemaLocation="scxml-datatypes.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-                This module defines SCXML Attribute DataTypes
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-attribs.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-                This module defines Common attributes for SCXML
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-contentmodels.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-                This module defines Common content model extensions  for SCXML
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<!-- datamodel -->
-	<xsd:attributeGroup name="scxml.datamodel.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.datamodel.content">
-		<xsd:sequence>
-			<xsd:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.datamodel.type">
-		<xsd:group ref="scxml.datamodel.content"/>
-		<xsd:attributeGroup ref="scxml.datamodel.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="datamodel" type="scxml.datamodel.type"/>
-
-	<!-- data -->
-	<xsd:attributeGroup name="scxml.data.attlist">
-		<xsd:attribute name="id" type="xsd:ID" use="required"/>
-		<xsd:attribute name="src" type="URI.datatype"/>
-		<xsd:attribute name="expr" type="ValueLang.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.data.content">
-		<xsd:sequence>
-			<xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.data.type" mixed="true">
-		<xsd:group ref="scxml.data.content"/>
-		<xsd:attributeGroup ref="scxml.data.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="data" type="scxml.data.type"/>
-
-	
-
-	<!-- param -->
-	<xsd:attributeGroup name="scxml.param.attlist">
-		<xsd:attribute name="name" type="xsd:NMTOKEN" use="required"/>
-		<xsd:attribute name="expr" type="ValueLang.datatype"/>
-		<xsd:attribute name="location" type="LocLang.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.param.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.param.type">
-		<xsd:group ref="scxml.param.content"/>
-		<xsd:attributeGroup ref="scxml.param.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="param" type="scxml.param.type"/>
-
-<!--  assign  -->
-	<xsd:attributeGroup name="scxml.assign.attlist">
-		<xsd:attribute name="location" type="LocLang.datatype" use="required"/>
-		<xsd:attribute name="expr" type="ValueLang.datatype"/>
-		<xsd:attribute name="type" type="AssignType.datatype" default="replacechildren"/>
-		<xsd:attribute name="attr" type="xsd:NMTOKEN"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.assign.content">
-		<xsd:sequence>
-			<xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.assign.type" mixed="true">
-		<xsd:group ref="scxml.assign.content"/>
-		<xsd:attributeGroup ref="scxml.assign.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="assign" type="scxml.assign.type"/>
-
-	
-<!-- script -->	
-	<xsd:attributeGroup name="scxml.script.attlist">
-		<xsd:attribute name="src" type="URI.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.script.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.script.type" mixed="true">
-		<xsd:group ref="scxml.script.content"/>
-		<xsd:attributeGroup ref="scxml.script.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="script" type="scxml.script.type"/>
-
-	<!-- content -->
-	<xsd:attributeGroup name="scxml.content.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-		<xsd:attribute name="expr" type="ValueLang.datatype"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.content.content">
-		<xsd:sequence>
-		<xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.content.type" mixed="true">
-		<xsd:group ref="scxml.content.content"/>
-		<xsd:attributeGroup ref="scxml.content.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="content" type="scxml.content.type"/>
-	
-</xsd:schema>
diff --git a/test/schema/scxml-module-external.xsd b/test/schema/scxml-module-external.xsd
deleted file mode 100644
index ae6ced3..0000000
--- a/test/schema/scxml-module-external.xsd
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-	<xsd:annotation>
-		<xsd:documentation>
-        This is the XML Schema external module for SCXML
-        * send 
-        * cancel
-        * invoke
-        * finalize 
-        The external module defines these elements and their
-        attributes.
-        </xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-
-	<xsd:include schemaLocation="scxml-datatypes.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            This module defines SCXML Attribute DataTypes
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-attribs.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            This module defines Common attributes for SCXML
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-contentmodels.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-            This module defines Common content model extensions  for SCXML
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-<!-- send -->
-	<xsd:attributeGroup name="scxml.send.attlist">
-		<xsd:attribute name="event" type="EventType.datatype"/>
-		<xsd:attribute name="eventexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="target" type="URI.datatype"/>
-		<xsd:attribute name="targetexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="type" type="xsd:string" default="scxml"/>
-		<xsd:attribute name="typeexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="idlocation" type="LocLang.datatype"/>
-		<xsd:attribute name="delay" type="Duration.datatype" default="0s"/>
-		<xsd:attribute name="delayexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="namelist" type="xsd:string"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.send.mix">
-		<xsd:choice>
-			<xsd:element ref="content" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="param" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:choice>
-	</xsd:group>
-	<xsd:group name="scxml.send.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.send.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.send.type">
-		<xsd:group ref="scxml.send.content"/>
-		<xsd:attributeGroup ref="scxml.send.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="send" type="scxml.send.type"/>
-	
-	<!-- cancel -->
-	<xsd:attributeGroup name="scxml.cancel.attlist">
-		<xsd:attribute name="sendid" type="xsd:IDREF"/>
-		<xsd:attribute name="sendidexpr" type="ValueLang.datatype"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-		<xsd:group name="scxml.cancel.mix">
-		<xsd:sequence>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="scxml.cancel.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.cancel.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.cancel.type">
-		<xsd:group ref="scxml.cancel.content"/>
-		<xsd:attributeGroup ref="scxml.cancel.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="cancel" type="scxml.cancel.type"/>
-	
-		
-
-	<!-- invoke -->
-	<xsd:attributeGroup name="scxml.invoke.attlist">
-		<xsd:attribute name="type" type="xsd:string" default="scxml"/>
-		<xsd:attribute name="typeexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="src" type="URI.datatype"/>
-		<xsd:attribute name="srcexpr" type="ValueLang.datatype"/>
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="idlocation" type="LocLang.datatype"/>
-		<xsd:attribute name="namelist" type="xsd:string"/>
-		<xsd:attribute name="autoforward" type="Boolean.datatype" use="optional" default="false"/>
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.invoke.mix">
-		<xsd:sequence>
-			<xsd:element ref="content" minOccurs="0" maxOccurs="1"/>
-			<xsd:element ref="param" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="finalize" minOccurs="0" maxOccurs="1"/>
-			<xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="scxml.invoke.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.invoke.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.invoke.type">
-		<xsd:group ref="scxml.invoke.content"/>
-		<xsd:attributeGroup ref="scxml.invoke.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="invoke" type="scxml.invoke.type"/>
-
-	<!-- finalize -->
-	<xsd:attributeGroup name="scxml.finalize.attlist">
-		<xsd:attributeGroup ref="scxml.extra.attribs"/>
-	</xsd:attributeGroup>
-	<xsd:group name="scxml.finalize.mix">
-		<xsd:sequence>
-			<xsd:group ref="scxml.core.executablecontent"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:group name="scxml.finalize.content">
-		<xsd:sequence>
-			<xsd:group ref="scxml.finalize.mix" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:group>
-	<xsd:complexType name="scxml.finalize.type">
-		<xsd:group ref="scxml.finalize.content"/>
-		<xsd:attributeGroup ref="scxml.finalize.attlist"/>
-	</xsd:complexType>
-	<xsd:element name="finalize" type="scxml.finalize.type"/>
-
-
-</xsd:schema>
diff --git a/test/schema/scxml.xsd b/test/schema/scxml.xsd
deleted file mode 100644
index 000a909..0000000
--- a/test/schema/scxml.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.w3.org/2005/07/scxml"
-    xmlns="http://www.w3.org/2005/07/scxml"
-    elementFormDefault="qualified">
-
-	<xsd:annotation>
-		<xsd:documentation>
-			This is the XML Schema driver for SCXML 1.0.
-			Please use this namespace for SCXML 1.0 elements:
-
-			"http://www.w3.org/2005/07/scxml"
-
-		</xsd:documentation>
-		<xsd:documentation source="scxml-copyright.xsd"/>
-	</xsd:annotation>
-	<xsd:annotation>
-		<xsd:documentation>
-			This is the XML Schema driver file for SCXML 1.0.
-
-			This schema:
-			+ sets the namespace for SCXML 1.0
-			+ imports external schemas (xml.xsd)
-			+ imports SCXML common datatypes, attributes and content models
-			+ imports modular schemas
-
-        	SCXML 1.0 includes:
-			+ SCXML core constructs
-			+ SCXML executable content
-			+ SCXML data model and manipulation
-			+ SCXML external communications
-
-			This schema is permissive such that it accomodates all
-			datamodels, but validating documents may contain markup that
-			is ignored in certain datamodels.
-		</xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-				This import brings in the XML namespace attributes
-				The XML attributes are used by various modules.
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:import>
-
-<xsd:include schemaLocation="scxml-module-core.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-				This imports the core elements for SCXML.
-			    </xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-	
-	<xsd:include schemaLocation="scxml-module-data.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-				This imports the data modelelements for SCXML.
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-
-	<xsd:include schemaLocation="scxml-module-external.xsd">
-		<xsd:annotation>
-			<xsd:documentation>
-				This imports the external communications elements for SCXML. 
-			</xsd:documentation>
-		</xsd:annotation>
-	</xsd:include>
-	
-<!-- the various elements of executable content are defined in the relevant modules. 
-This gathers them up into a single type -->
-	<xsd:group name="scxml.core.executablecontent">
-		<xsd:choice>
-	    <xsd:group ref="scxml.extra.content" minOccurs="0" maxOccurs="unbounded"/> 
-			<xsd:element ref="raise"/> 
-    	<xsd:element ref="if"/> 
-			<xsd:element ref="foreach"/> 
-			<xsd:element ref="send"/> 
-			<xsd:element ref="script"/>
-			<xsd:element ref="assign"/> 
-			<xsd:element ref="log"/>
-			<xsd:element ref="cancel"/>
-	</xsd:choice>
-	</xsd:group>
-
-</xsd:schema>
diff --git a/test/src/test-arabica-namespaces.cpp b/test/src/test-arabica-namespaces.cpp
new file mode 100644
index 0000000..baebeee
--- /dev/null
+++ b/test/src/test-arabica-namespaces.cpp
@@ -0,0 +1,221 @@
+#include <iostream>
+
+#include "uscxml/config.h"
+#include "uscxml/Common.h"
+#include <DOM/Document.hpp>
+#include <XPath/XPath.hpp>
+#include <DOM/SAX2DOM/SAX2DOM.hpp>
+#include <DOM/io/Stream.hpp>
+#include "uscxml/Interpreter.h"
+#include "uscxml/DOMUtils.h"
+
+using namespace Arabica::DOM;
+using namespace Arabica::XPath;
+using namespace uscxml;
+
+#define VALIDATE \
+std::pair<Document<std::string>, NameSpaceInfo> parsed = parse(xmlSS.str());\
+Document<std::string> origDoc = parsed.first;\
+NameSpaceInfo origNS = parsed.second;\
+validateRootFoo(parsed);\
+insertBar(parsed);\
+std::cout << parsed.first << std::endl;\
+validateRootFooBar(parsed);\
+parsed = cloneDocument(parsed);\
+insertBaz(parsed);\
+std::cout << parsed.first << std::endl;\
+validateRootFooBarBaz(parsed);\
+assert(Interpreter::filterChildElements(origNS.xmlNSPrefix + "bar", origDoc.getDocumentElement()).size() == 3);\
+assert(Interpreter::filterChildElements(origNS.xmlNSPrefix + "baz", origDoc.getDocumentElement()).size() == 0);
+
+
+/**
+ Test DOM manipulations and document cloning with different namespace scenarios
+ */
+
+static std::string testPath;
+static Arabica::XPath::XPath<std::string> _xpath;
+
+std::pair<Document<std::string>, NameSpaceInfo> parse(const std::string xmlString) {
+	NameSpacingParser parser = NameSpacingParser::fromXML(xmlString);
+	if (parser.errorsReported())
+		assert(false);
+	return std::make_pair(parser.getDocument(), parser.nameSpace);
+}
+
+std::pair<Document<std::string>, NameSpaceInfo> cloneDocument(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Document<std::string> clonedDocument;
+	DOMImplementation<std::string> domFactory = Arabica::SimpleDOM::DOMImplementation<std::string>::getDOMImplementation();
+	clonedDocument = domFactory.createDocument(document.getNamespaceURI(), "", 0);
+
+	Node<std::string> child = document.getFirstChild();
+	while (child) {
+		Node<std::string> newNode = clonedDocument.importNode(child, true);
+		clonedDocument.appendChild(newNode);
+		child = child.getNextSibling();
+	}
+
+	return std::make_pair(clonedDocument, nsInfo);
+}
+
+void insertBar(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Node<std::string> root = document.getDocumentElement();
+	for (int i = 0; i < 3; i++) {
+		Element<std::string> bar = document.createElementNS(nsInfo.nsURL, "bar");
+//		if (nsInfo.nsToPrefix.find(nsInfo.nsURL) != nsInfo.nsToPrefix.end())
+		nsInfo.setPrefix(bar);
+		root.appendChild(bar);
+	}
+}
+
+void insertBaz(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Node<std::string> root = document.getDocumentElement();
+	for (int i = 0; i < 3; i++) {
+		Element<std::string> baz = document.createElementNS(nsInfo.nsURL, "baz");
+		nsInfo.setPrefix(baz);
+		root.appendChild(baz);
+	}
+}
+
+static void validateRootFoo(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Node<std::string> root = document.getDocumentElement();
+	_xpath.setNamespaceContext(*nsInfo.nsContext);
+
+	assert(TAGNAME(root) == nsInfo.xmlNSPrefix + "root");
+	assert(LOCALNAME(root) == "root");
+	NodeSet<std::string> foosFiltered = Interpreter::filterChildElements(nsInfo.xmlNSPrefix + "foo", root);
+	assert(foosFiltered.size() == 3);
+	NodeSet<std::string> foosXPath = _xpath.evaluate("//" + nsInfo.xpathPrefix + "foo", root).asNodeSet();
+	assert(foosXPath.size() == 3);
+
+	for (int i = 0; i < 3; i++) {
+		assert(foosFiltered[i] == foosXPath[i]);
+		assert(TAGNAME(foosFiltered[i]) == nsInfo.xmlNSPrefix + "foo");
+		assert(LOCALNAME(foosFiltered[i]) == "foo");
+	}
+
+}
+
+static void validateRootFooBar(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+	validateRootFoo(parsed);
+
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Node<std::string> root = document.getDocumentElement();
+	_xpath.setNamespaceContext(*nsInfo.nsContext);
+
+	NodeSet<std::string> barsFiltered = Interpreter::filterChildElements(nsInfo.xmlNSPrefix + "bar", root);
+	assert(barsFiltered.size() == 3);
+	NodeSet<std::string> barsXPath = _xpath.evaluate("//" + nsInfo.xpathPrefix + "bar", root).asNodeSet();
+	assert(barsXPath.size() == 3);
+
+	for (int i = 0; i < 3; i++) {
+		assert(barsFiltered[i] == barsXPath[i]);
+		assert(TAGNAME(barsFiltered[i]) == nsInfo.xmlNSPrefix + "bar");
+		assert(LOCALNAME(barsFiltered[i]) == "bar");
+	}
+
+}
+
+static void validateRootFooBarBaz(std::pair<Document<std::string>, NameSpaceInfo>& parsed) {
+	validateRootFooBar(parsed);
+
+	NameSpaceInfo nsInfo = parsed.second;
+	Document<std::string> document = parsed.first;
+
+	Node<std::string> root = document.getDocumentElement();
+	_xpath.setNamespaceContext(*nsInfo.nsContext);
+
+	assert(TAGNAME(root) == nsInfo.xmlNSPrefix + "root");
+	assert(LOCALNAME(root) == "root");
+
+	NodeSet<std::string> bazsFiltered = Interpreter::filterChildElements(nsInfo.xmlNSPrefix + "baz", root);
+	assert(bazsFiltered.size() == 3);
+	NodeSet<std::string> bazsXPath = _xpath.evaluate("//" + nsInfo.xpathPrefix + "baz", root).asNodeSet();
+	assert(bazsXPath.size() == 3);
+
+	for (int i = 0; i < 3; i++) {
+		assert(bazsFiltered[i] == bazsXPath[i]);
+		assert(TAGNAME(bazsFiltered[i]) == nsInfo.xmlNSPrefix + "baz");
+		assert(LOCALNAME(bazsFiltered[i]) == "baz");
+	}
+
+}
+
+int main(int argc, char** argv) {
+
+	if (argc < 2) {
+		std::cerr << "Expected path to the tests as first argument";
+		exit(EXIT_FAILURE);
+	}
+	testPath = argv[1];
+
+	// No namespaces at all
+	{
+		std::stringstream xmlSS;
+		xmlSS << "<root><foo /><foo /><foo /></root>" << std::endl;
+		VALIDATE
+	}
+
+	// default namespace
+	{
+		std::stringstream xmlSS;
+		xmlSS << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+		<root xmlns=\"http://www.w3.org/2005/07/scxml\">\
+			<foo /><foo /><foo />\
+		</root>\
+		" << std::endl;
+		VALIDATE
+	}
+
+	// explicit namespaces
+	{
+		std::stringstream xmlSS;
+		xmlSS << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+		<scxml:root xmlns:scxml=\"http://www.w3.org/2005/07/scxml\">\
+			<scxml:foo /><scxml:foo /><scxml:foo />\
+		</scxml:root>\
+		" << std::endl;
+		VALIDATE
+	}
+
+	// mixed namespaces
+	{
+		std::stringstream xmlSS;
+		xmlSS << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+		<scxml:root xmlns:scxml=\"http://www.w3.org/2005/07/scxml\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\
+		<xhtml:foo /><xhtml:foo /><xhtml:foo />\
+		<scxml:foo /><scxml:foo /><scxml:foo />\
+		</scxml:root>\
+		" << std::endl;
+		VALIDATE
+	}
+
+	// mixed namespaces with different default NS
+	{
+		std::stringstream xmlSS;
+		xmlSS << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+		<scxml:root xmlns:scxml=\"http://www.w3.org/2005/07/scxml\" xmlns=\"http://www.w3.org/1999/xhtml\">\
+		<foo /><foo /><foo />\
+		<scxml:foo /><scxml:foo /><scxml:foo />\
+		</scxml:root>\
+		" << std::endl;
+		VALIDATE
+	}
+
+}
\ No newline at end of file
diff --git a/test/src/test-promela-parser.cpp b/test/src/test-promela-parser.cpp
index 940e55a..a2faed2 100644
--- a/test/src/test-promela-parser.cpp
+++ b/test/src/test-promela-parser.cpp
@@ -15,54 +15,55 @@ extern int promela_debug;
 
 int main(int argc, char** argv) {
 	promela_debug = 0;
-	
+
 	std::list<std::string> expressions;
 	/* declarations  */
-//	expressions.push_back("bool b1");
-//	expressions.push_back("bool b1;");
-//	expressions.push_back("bool b1, b2, b3");
-//	expressions.push_back("bool b1, b2, b3;");
-//	expressions.push_back("bool b1, b2 = 3 + 4, b3, b4, b5;");
-//	expressions.push_back("bool b1; bool b2; bool b3; bool b4;");
-//	expressions.push_back("bool b1; bool b2; bool b3, b4, b5;");
-//	expressions.push_back("bit b = 1;");
-//	expressions.push_back("byte state = 1;");
-//	expressions.push_back("bool b1, b2 = 1, b3;");
-//	expressions.push_back("bool busy[3];");
-//	expressions.push_back("bool busy[3], us[4];");
-//	expressions.push_back("mtype = {\nred, white, blue,\nabort, accept, ack, sync_ack, close, connect,\ncreate, data, eof, open, reject, sync, transfer,\nFATAL, NON_FATAL, COMPLETE\n}");
+	expressions.push_back("bool b1");
+	expressions.push_back("bool b1;");
+	expressions.push_back("bool b1, b2, b3");
+	expressions.push_back("bool b1, b2, b3;");
+	expressions.push_back("bool b1, b2 = 3 + 4, b3, b4, b5;");
+	expressions.push_back("bool b1; bool b2; bool b3; bool b4;");
+	expressions.push_back("bool b1; bool b2; bool b3, b4, b5;");
+	expressions.push_back("bit b = 1;");
+	expressions.push_back("byte state = 1;");
+	expressions.push_back("bool b1, b2 = 1, b3;");
+	expressions.push_back("bool busy[3];");
+	expressions.push_back("bool busy[3], us[4];");
+	expressions.push_back("mtype = {\nred, white, blue,\nabort, accept, ack, sync_ack, close, connect,\ncreate, data, eof, open, reject, sync, transfer,\nFATAL, NON_FATAL, COMPLETE\n}");
 
 	/* expressions  */
-//	expressions.push_back("i+1");
-//	expressions.push_back("(x == false || t == Bturn);");
-//	expressions.push_back("a + (1 << b)");
-//	expressions.push_back("(a + 1) << b");
-//	expressions.push_back("(b < N)");
-//	expressions.push_back("(mt+1)%MAX;");
-//	expressions.push_back("state[0] = state[3] + 5 * state[3*2/n]");
-	
+	expressions.push_back("i+1");
+	expressions.push_back("(x == false || t == Bturn);");
+	expressions.push_back("a + (1 << b)");
+	expressions.push_back("(a + 1) << b");
+	expressions.push_back("(b < N)");
+	expressions.push_back("(mt+1)%MAX;");
+	expressions.push_back("state[0] = state[3] + 5 * state[3*2/n]");
+
 	/* statements  */
-//	expressions.push_back("t = Bturn;");
-//	expressions.push_back("c++");
-//	expressions.push_back("state = state - 1");
-//	expressions.push_back("printf(\"hello world\\n\")");
-//	expressions.push_back("printf(\"result %d: %d\n\", id, res, foo, bar)");
-//	expressions.push_back("printf(\"x = %d\n\", x)");
-//	expressions.push_back("(n <= 1)");
-//	expressions.push_back("res = (a*a+b)/2*a;");
-//	expressions.push_back("assert(0)	/* a forced stop, (Chapter 6) */");
-//	expressions.push_back("assert(count == 0 || count == 1)");
-	
-	for (std::list<std::string>::iterator exprIter = expressions.begin();
-			 exprIter != expressions.end();
-			 exprIter++) {
-		try {
-			std::cout << std::endl << "'" << *exprIter << "':" << std::endl;
-			PromelaParser ast(*exprIter);
-			ast.dump();
-		} catch (Event e) {
-			std::cerr << e << std::endl;
-		}
-	}
+	expressions.push_back("t = Bturn;");
+	expressions.push_back("c++");
+	expressions.push_back("state = state - 1");
+	expressions.push_back("printf(\"hello world\\n\")");
+	expressions.push_back("printf(\"result %d: %d\n\", id, res, foo, bar)");
+	expressions.push_back("printf(\"x = %d\n\", x)");
+	expressions.push_back("(n <= 1)");
+	expressions.push_back("res = (a*a+b)/2*a;");
+	expressions.push_back("assert(0)	/* a forced stop, (Chapter 6) */");
+	expressions.push_back("assert(count == 0 || count == 1)");
+	expressions.push_back("busy[4 - 3] = 1;");
 
+	while(true)
+		for (std::list<std::string>::iterator exprIter = expressions.begin();
+		        exprIter != expressions.end();
+		        exprIter++) {
+			try {
+				std::cout << std::endl << "'" << *exprIter << "':" << std::endl;
+				PromelaParser ast(*exprIter);
+				ast.dump();
+			} catch (Event e) {
+				std::cerr << e << std::endl;
+			}
+		}
 }
\ No newline at end of file
diff --git a/test/src/test-trie.cpp b/test/src/test-trie.cpp
new file mode 100644
index 0000000..8c7ab15
--- /dev/null
+++ b/test/src/test-trie.cpp
@@ -0,0 +1,92 @@
+#include "uscxml/util/Trie.h"
+#include <iostream>
+#include <assert.h>
+
+using namespace uscxml;
+
+int main(int argc, char** argv) {
+	{
+		Trie trie;
+		int nrTokens = 0;
+		size_t offset = 0;
+		std::string word = "this is to be tokenized";
+		std::string token;
+		while((offset = trie.getNextToken(word, offset, token)) != std::string::npos) {
+			std::cout << "\"" << token << "\" ";
+			nrTokens++;
+		}
+		std::cout << std::endl;
+		assert(nrTokens == word.length());
+	}
+
+	{
+		Trie trie(" ");
+		int nrTokens = 0;
+		size_t offset = 0;
+		std::string word = "this is to be tokenized";
+		std::string token;
+		while(offset = trie.getNextToken(word, offset, token), token.length() > 0) {
+			std::cout << "\"" << token << "\" ";
+			nrTokens++;
+		}
+		std::cout << std::endl;
+		assert(nrTokens == 5);
+	}
+
+	{
+		Trie trie("#");
+		int nrTokens = 0;
+		size_t offset = 0;
+		std::string word = "#bb#bbbb#b#bbb#bb#b#";
+		std::string token;
+		while(offset = trie.getNextToken(word, offset, token), token.length() > 0) {
+			std::cout << "\"" << token << "\" ";
+			nrTokens++;
+		}
+		std::cout << std::endl;
+		assert(nrTokens == 6);
+	}
+
+	{
+		Trie trie("  ");
+		int nrTokens = 0;
+		size_t offset = 0;
+		std::string word = "  this is  to  be tokenized";
+		std::string token;
+		while(offset = trie.getNextToken(word, offset, token), token.length() > 0) {
+			std::cout << "\"" << token << "\" ";
+			nrTokens++;
+		}
+		std::cout << std::endl;
+		assert(nrTokens == 3);
+	}
+
+	{
+		Trie trie("");
+		trie.addWord("a");
+		trie.addWord("b");
+
+		trie.dump();
+	}
+
+	{
+		Trie trie(".");
+		trie.addWord("foo.bar");
+		trie.addWord("foo.foo");
+		trie.addWord("foo.foo.baz");
+		trie.addWord("foz.foo.baz");
+		trie.addWord("foz.foo");
+
+		trie.dump();
+
+		std::list<TrieNode*> childs;
+
+		childs = trie.getChildsWithWords(trie.root);
+		assert(childs.size() == 5);
+
+		assert(trie.getNodeWithPrefix("") == trie.root);
+
+		childs = trie.getWordsWithPrefix("");
+		assert(childs.size() == 5);
+	}
+}
\ No newline at end of file
diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp
index 102487f..1052fda 100644
--- a/test/src/test-w3c.cpp
+++ b/test/src/test-w3c.cpp
@@ -90,7 +90,7 @@ void customTerminate() {
 }
 
 class W3CStatusMonitor : public uscxml::InterpreterMonitor {
-	
+
 	void beforeTakingTransition(uscxml::Interpreter interpreter, const Arabica::DOM::Element<std::string>& transition, bool moreComing) {
 		std::cout << "Transition: " << uscxml::DOMUtils::xPathForNode(transition) << std::endl;
 	}
@@ -100,11 +100,11 @@ class W3CStatusMonitor : public uscxml::InterpreterMonitor {
 		printNodeSet(interpreter.getConfiguration());
 		std::cout << "}" << std::endl;
 	}
-	
+
 	void beforeProcessingEvent(uscxml::Interpreter interpreter, const uscxml::Event& event) {
 		std::cout << "Event: " << event.name << std::endl;
 	}
-	
+
 	void beforeExitingState(uscxml::Interpreter interpreter, const Arabica::DOM::Element<std::string>& state, bool moreComing) {
 		exitingStates.push_back(state);
 		if (!moreComing) {
@@ -133,7 +133,7 @@ class W3CStatusMonitor : public uscxml::InterpreterMonitor {
 			seperator = ", ";
 		}
 	}
-	
+
 	void beforeCompletion(uscxml::Interpreter interpreter) {
 		Arabica::XPath::NodeSet<std::string> config = interpreter.getConfiguration();
 		if (config.size() == 1) {
@@ -153,7 +153,7 @@ class W3CStatusMonitor : public uscxml::InterpreterMonitor {
 		std::cout << "TEST FAILED" << std::endl;
 		exit(EXIT_FAILURE);
 	}
-	
+
 	Arabica::XPath::NodeSet<std::string> exitingStates;
 	Arabica::XPath::NodeSet<std::string> enteringStates;
 };
@@ -176,8 +176,8 @@ int main(int argc, char** argv) {
 	google::InitGoogleLogging(argv[0]);
 	google::LogToStderr();
 
-	
-  for (int i = 1; i < argc; i++) {
+
+	for (int i = 1; i < argc; i++) {
 		if (std::string(argv[i]) == "-f") {
 			withFlattening = true;
 		} else {
@@ -189,7 +189,7 @@ int main(int argc, char** argv) {
 	LOG(INFO) << "Processing " << documentURI << (withFlattening ? " FSM converted" : "");
 	if (withFlattening) {
 		Interpreter flatInterpreter = Interpreter::fromURI(documentURI);
-		interpreter = Interpreter::fromDOM(ChartToFSM::flatten(flatInterpreter.getDocument(), flatInterpreter.getNameSpaceInfo()), flatInterpreter.getNameSpaceInfo());
+		interpreter = Interpreter::fromDOM(ChartToFSM::flatten(flatInterpreter).getDocument(), flatInterpreter.getNameSpaceInfo());
 		interpreter.setNameSpaceInfo(interpreter.getNameSpaceInfo());
 	} else {
 		interpreter = Interpreter::fromURI(documentURI);
diff --git a/test/samples/uscxml/applications/SpatialMapTicker.java b/test/uscxml/applications/SpatialMapTicker.java
index 8d2a5f1..8d2a5f1 100644
--- a/test/samples/uscxml/applications/SpatialMapTicker.java
+++ b/test/uscxml/applications/SpatialMapTicker.java
diff --git a/test/samples/uscxml/audio/click.wav b/test/uscxml/applications/click.wav
index e11b0b7..e11b0b7 100644
--- a/test/samples/uscxml/audio/click.wav
+++ b/test/uscxml/applications/click.wav
diff --git a/test/samples/uscxml/applications/spoken-map-ticker.scxml b/test/uscxml/applications/spoken-map-ticker.scxml
index 5a1c0b2..5a1c0b2 100644
--- a/test/samples/uscxml/applications/spoken-map-ticker.scxml
+++ b/test/uscxml/applications/spoken-map-ticker.scxml
diff --git a/test/samples/uscxml/applications/spoken-map-ticker.xhtml b/test/uscxml/applications/spoken-map-ticker.xhtml
index ace8724..ace8724 100644
--- a/test/samples/uscxml/applications/spoken-map-ticker.xhtml
+++ b/test/uscxml/applications/spoken-map-ticker.xhtml
diff --git a/test/samples/uscxml/arabica/test-arabica-events.xml b/test/uscxml/arabica/test-arabica-events.xml
index 8998fd9..8998fd9 100644
--- a/test/samples/uscxml/arabica/test-arabica-events.xml
+++ b/test/uscxml/arabica/test-arabica-events.xml
diff --git a/test/samples/uscxml/arabica/test-arabica-parsing.xml b/test/uscxml/arabica/test-arabica-parsing.xml
index f4e46fb..f4e46fb 100644
--- a/test/samples/uscxml/arabica/test-arabica-parsing.xml
+++ b/test/uscxml/arabica/test-arabica-parsing.xml
diff --git a/test/samples/uscxml/applications/click.wav b/test/uscxml/audio/click.wav
index e11b0b7..e11b0b7 100644
--- a/test/samples/uscxml/applications/click.wav
+++ b/test/uscxml/audio/click.wav
diff --git a/test/samples/uscxml/chartToFSM/test-event-desc-merging.scxml b/test/uscxml/chartToFSM/test-event-desc-merging.scxml
index 7ab14db..7ab14db 100644
--- a/test/samples/uscxml/chartToFSM/test-event-desc-merging.scxml
+++ b/test/uscxml/chartToFSM/test-event-desc-merging.scxml
diff --git a/test/samples/uscxml/chartToFSM/test-event-set-conflict.scxml b/test/uscxml/chartToFSM/test-event-set-conflict.scxml
index cc76238..cc76238 100644
--- a/test/samples/uscxml/chartToFSM/test-event-set-conflict.scxml
+++ b/test/uscxml/chartToFSM/test-event-set-conflict.scxml
diff --git a/test/samples/uscxml/chartToFSM/test-flattening.scxml b/test/uscxml/chartToFSM/test-flattening.scxml
index 7d2516e..7d2516e 100644
--- a/test/samples/uscxml/chartToFSM/test-flattening.scxml
+++ b/test/uscxml/chartToFSM/test-flattening.scxml
diff --git a/test/samples/uscxml/prolog/likes.pl b/test/uscxml/prolog/likes.pl
index 22395ed..22395ed 100644
--- a/test/samples/uscxml/prolog/likes.pl
+++ b/test/uscxml/prolog/likes.pl
diff --git a/test/uscxml/promela/test-invokers.scxml b/test/uscxml/promela/test-invokers.scxml
new file mode 100644
index 0000000..df94756
--- /dev/null
+++ b/test/uscxml/promela/test-invokers.scxml
@@ -0,0 +1,21 @@
+<scxml datamodel="promela">
+  <state id="s0">
+    <invoke type="scxml">
+      <!-- 
+        promela-event-source:
+        to.s1
+      -->
+      <content>
+        <scxml>
+          <state id="s0">
+            <onentry>
+              <send target="#_parent" event="to.s1" />
+            </onentry>
+          </state>
+        </scxml>
+      </content>
+    </invoke>
+    <transition event="to.s1" target="s1" />
+  </state>
+  <state id="s1" final="true" />
+</scxml>
\ No newline at end of file
diff --git a/test/uscxml/promela/test-non-progress.scxml b/test/uscxml/promela/test-non-progress.scxml
new file mode 100644
index 0000000..2301bd6
--- /dev/null
+++ b/test/uscxml/promela/test-non-progress.scxml
@@ -0,0 +1,17 @@
+<!-- 
+  Check for no-progress cycles
+
+  $ uscxml-transform -s -i this_file.scxml > test.pml
+  $ spin -a test.pml
+  $ gcc -DNP pan.c
+  $ ./a.out -l
+-->
+<scxml datamodel="promela">
+  <state id="s0">
+    <onentry>
+      <raise event="foo" />
+    </onentry>
+    <transition event="foo" target="s0" />
+  </state>
+  <state id="s1" final="true" />
+</scxml>
\ No newline at end of file
diff --git a/test/uscxml/promela/test-progress-label.scxml b/test/uscxml/promela/test-progress-label.scxml
new file mode 100644
index 0000000..8e27345
--- /dev/null
+++ b/test/uscxml/promela/test-progress-label.scxml
@@ -0,0 +1,20 @@
+<!-- 
+
+  Check for no-progress cycles
+
+  $ uscxml-transform -s -i this_file.scxml > test.pml
+  $ spin -a test.pml
+  $ gcc -DNP pan.c
+  $ ./a.out -l
+
+-->
+<scxml datamodel="promela">
+  <state id="s0">
+    <onentry>
+      <!-- promela-progress -->
+      <raise event="foo" />
+    </onentry>
+    <transition event="foo" target="s0" />
+  </state>
+  <state id="s1" final="true" />
+</scxml>
\ No newline at end of file
diff --git a/test/uscxml/promela/test-simple.scxml b/test/uscxml/promela/test-simple.scxml
new file mode 100644
index 0000000..61c8022
--- /dev/null
+++ b/test/uscxml/promela/test-simple.scxml
@@ -0,0 +1,15 @@
+<!-- 
+  Simple example
+  
+  $ uscxml-transform -s -i this_file.scxml > test.pml
+  $ spin -p -l -h test.pml
+-->
+<scxml datamodel="promela">
+  <state id="s0">
+    <onentry>
+      <raise event="foo" />
+    </onentry>
+    <transition event="foo" target="s1" />
+  </state>
+  <state id="s1" final="true" />
+</scxml>
\ No newline at end of file
diff --git a/test/uscxml/promela/test-syntax.scxml b/test/uscxml/promela/test-syntax.scxml
new file mode 100644
index 0000000..619e138
--- /dev/null
+++ b/test/uscxml/promela/test-syntax.scxml
@@ -0,0 +1,122 @@
+<scxml datamodel="promela" binding="early" >
+  <!--
+    promela-event-source:
+      foo.bar
+      foo.baz foo.foo
+      error.communication 
+      error.platform 
+      err.foo
+  -->
+  <datamodel>
+    <data>
+      bool b1;
+    </data>
+    <data>
+      int fooSum = 0;
+      int fooIndex = 0;
+      int fooItem;
+      int foos[10];
+    </data>
+    <data>
+      bool b2, b3, b4;
+    </data>
+    <data>
+      bool b5, b6 = 3 + 4, b7, b8, b9;
+    </data>
+    <data>
+      bool c1; bool c2; bool c3; bool c4;
+      bool c5; bool c6; bool c7, c8 = 4 + 6, c9;
+    </data>
+    <data>
+      byte state = 1;
+      mtype = {
+        FATAL, NON_FATAL, COMPLETE, INCOMPLETE,
+        red, white, blue
+      }
+    </data>
+    <data>
+      bool busy[3];
+      bool lazy[4];
+    </data>
+    <data>
+      bool v3, v2 = 1;
+    </data>
+    
+  </datamodel>
+  <state id="init">
+    <invoke type="scxml">
+      <!--
+        promela-event-source:
+        innerFoo
+      -->
+      
+      <final id="stop">
+        <onentry>
+          <send target="#_parent" event="innerFoo" />
+        </onentry>
+      </final>
+    </invoke>
+    <onentry>
+      <!--
+        promela-inline:
+        progress: skip;
+      -->
+      <raise event="foo.bar" />
+      <script>
+        busy[4 - 3] = 1;
+      </script>
+      <log label="foos" expr="foos" />
+      <foreach item="fooItem" array="foos" index="fooIndex">
+        <script>
+          foos[fooIndex] = fooIndex;
+        </script>
+      </foreach>
+      <log label="foos" expr="foos" />
+      <foreach item="fooItem" array="foos" index="fooIndex">
+        <log label="fooItem" expr="fooItem" />
+        <script>
+          fooSum = fooSum + fooItem;
+        </script>
+      </foreach>
+      <log label="fooSum" expr="fooSum" />
+      <if cond="b1==0">
+        <script>
+          b2=1; b3=1;
+        </script>
+      <elseif cond="b1==1" />
+        <script>
+          b2=1; b3=1;
+        </script>
+      <else />
+        <script>
+          b2=1; b3=1;
+        </script>
+      </if>
+      <script>
+        v2=1; v3=1;
+      </script>
+    </onentry>
+    <transition target="pass" cond="v2==v3 &amp;&amp; busy[1] == 1" event="foo.bar">
+      <!--
+        promela-inline:
+        progress: skip;
+      -->
+    </transition>
+    <transition target="fail" event="*">
+      <!--
+        promela-inline:
+        progress: skip;
+      -->
+    </transition>
+  </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/uscxml/proto/3DViewer/CameraPos.proto b/test/uscxml/proto/3DViewer/CameraPos.proto
index 6178ef4..6178ef4 100644
--- a/test/samples/uscxml/proto/3DViewer/CameraPos.proto
+++ b/test/uscxml/proto/3DViewer/CameraPos.proto
diff --git a/test/samples/uscxml/proto/3DViewer/DirectoryListingService.proto b/test/uscxml/proto/3DViewer/DirectoryListingService.proto
index 4a0e412..4a0e412 100644
--- a/test/samples/uscxml/proto/3DViewer/DirectoryListingService.proto
+++ b/test/uscxml/proto/3DViewer/DirectoryListingService.proto
diff --git a/test/samples/uscxml/proto/3DViewer/LinearAlgebra.proto b/test/uscxml/proto/3DViewer/LinearAlgebra.proto
index 135ed00..135ed00 100644
--- a/test/samples/uscxml/proto/3DViewer/LinearAlgebra.proto
+++ b/test/uscxml/proto/3DViewer/LinearAlgebra.proto
diff --git a/test/samples/uscxml/proto/3DViewer/ModelInfo.proto b/test/uscxml/proto/3DViewer/ModelInfo.proto
index 3214a71..3214a71 100644
--- a/test/samples/uscxml/proto/3DViewer/ModelInfo.proto
+++ b/test/uscxml/proto/3DViewer/ModelInfo.proto
diff --git a/test/samples/uscxml/proto/3DViewer/Pose.proto b/test/uscxml/proto/3DViewer/Pose.proto
index c29d6ff..c29d6ff 100644
--- a/test/samples/uscxml/proto/3DViewer/Pose.proto
+++ b/test/uscxml/proto/3DViewer/Pose.proto
diff --git a/test/samples/uscxml/proto/3DViewer/SceneSetup.proto b/test/uscxml/proto/3DViewer/SceneSetup.proto
index b3b7697..b3b7697 100644
--- a/test/samples/uscxml/proto/3DViewer/SceneSetup.proto
+++ b/test/uscxml/proto/3DViewer/SceneSetup.proto
diff --git a/test/samples/uscxml/proto/3DViewer/SceneShotService.proto b/test/uscxml/proto/3DViewer/SceneShotService.proto
index c7412a3..c7412a3 100644
--- a/test/samples/uscxml/proto/3DViewer/SceneShotService.proto
+++ b/test/uscxml/proto/3DViewer/SceneShotService.proto
diff --git a/test/samples/uscxml/proto/Dependee.proto b/test/uscxml/proto/Dependee.proto
index bbd19fd..bbd19fd 100644
--- a/test/samples/uscxml/proto/Dependee.proto
+++ b/test/uscxml/proto/Dependee.proto
diff --git a/test/samples/uscxml/proto/Depender.proto b/test/uscxml/proto/Depender.proto
index 5fa9952..5fa9952 100644
--- a/test/samples/uscxml/proto/Depender.proto
+++ b/test/uscxml/proto/Depender.proto
diff --git a/test/samples/uscxml/proto/JSON.proto b/test/uscxml/proto/JSON.proto
index 255ab79..255ab79 100644
--- a/test/samples/uscxml/proto/JSON.proto
+++ b/test/uscxml/proto/JSON.proto
diff --git a/test/samples/uscxml/proto/Test.proto b/test/uscxml/proto/Test.proto
index 4e7ab6a..4e7ab6a 100644
--- a/test/samples/uscxml/proto/Test.proto
+++ b/test/uscxml/proto/Test.proto
diff --git a/test/samples/uscxml/proto/TestServices.proto b/test/uscxml/proto/TestServices.proto
index c96c34f..c96c34f 100644
--- a/test/samples/uscxml/proto/TestServices.proto
+++ b/test/uscxml/proto/TestServices.proto
diff --git a/test/samples/uscxml/scenegraph/HARD_MP_VAL_000.wrl b/test/uscxml/scenegraph/HARD_MP_VAL_000.wrl
index 603054c..603054c 100644
--- a/test/samples/uscxml/scenegraph/HARD_MP_VAL_000.wrl
+++ b/test/uscxml/scenegraph/HARD_MP_VAL_000.wrl
diff --git a/test/samples/uscxml/scripts/GreatCircle.js b/test/uscxml/scripts/GreatCircle.js
index 7a866d9..7a866d9 100644
--- a/test/samples/uscxml/scripts/GreatCircle.js
+++ b/test/uscxml/scripts/GreatCircle.js
diff --git a/test/samples/uscxml/scripts/test-simple-ecmascript.scxml b/test/uscxml/scripts/test-simple-ecmascript.scxml
index 10dee02..10dee02 100644
--- a/test/samples/uscxml/scripts/test-simple-ecmascript.scxml
+++ b/test/uscxml/scripts/test-simple-ecmascript.scxml
diff --git a/test/samples/uscxml/scxml-gui-test.scxml b/test/uscxml/scxml-gui-test.scxml
index adf93b8..adf93b8 100644
--- a/test/samples/uscxml/scxml-gui-test.scxml
+++ b/test/uscxml/scxml-gui-test.scxml
diff --git a/test/samples/uscxml/templates/mc-html.html b/test/uscxml/templates/mc-html.html
index 33eac77..33eac77 100644
--- a/test/samples/uscxml/templates/mc-html.html
+++ b/test/uscxml/templates/mc-html.html
diff --git a/test/samples/uscxml/templates/xhtml-invoker.html b/test/uscxml/templates/xhtml-invoker.html
index 7773231..7773231 100644
--- a/test/samples/uscxml/templates/xhtml-invoker.html
+++ b/test/uscxml/templates/xhtml-invoker.html
diff --git a/test/samples/uscxml/test-calendar.scxml b/test/uscxml/test-calendar.scxml
index a031d55..a031d55 100644
--- a/test/samples/uscxml/test-calendar.scxml
+++ b/test/uscxml/test-calendar.scxml
diff --git a/test/samples/uscxml/test-communication.scxml b/test/uscxml/test-communication.scxml
index 2cba08e..2cba08e 100644
--- a/test/samples/uscxml/test-communication.scxml
+++ b/test/uscxml/test-communication.scxml
diff --git a/test/samples/uscxml/test-custom-executable-content.scxml b/test/uscxml/test-custom-executable-content.scxml
index a40af93..a40af93 100644
--- a/test/samples/uscxml/test-custom-executable-content.scxml
+++ b/test/uscxml/test-custom-executable-content.scxml
diff --git a/test/samples/uscxml/test-dirmon.scxml b/test/uscxml/test-dirmon.scxml
index 1fba300..1fba300 100644
--- a/test/samples/uscxml/test-dirmon.scxml
+++ b/test/uscxml/test-dirmon.scxml
diff --git a/test/samples/uscxml/test-dom.scxml b/test/uscxml/test-dom.scxml
index 73b449c..73b449c 100644
--- a/test/samples/uscxml/test-dom.scxml
+++ b/test/uscxml/test-dom.scxml
diff --git a/test/samples/uscxml/test-donedata.scxml b/test/uscxml/test-donedata.scxml
index c48b6de..c48b6de 100644
--- a/test/samples/uscxml/test-donedata.scxml
+++ b/test/uscxml/test-donedata.scxml
diff --git a/test/samples/uscxml/test-ecmascript.scxml b/test/uscxml/test-ecmascript.scxml
index 4f0ff04..4f0ff04 100644
--- a/test/samples/uscxml/test-ecmascript.scxml
+++ b/test/uscxml/test-ecmascript.scxml
diff --git a/test/samples/uscxml/test-execution.scxml b/test/uscxml/test-execution.scxml
index 13373ba..13373ba 100644
--- a/test/samples/uscxml/test-execution.scxml
+++ b/test/uscxml/test-execution.scxml
diff --git a/test/samples/uscxml/test-expect.scxml b/test/uscxml/test-expect.scxml
index abd2a58..abd2a58 100644
--- a/test/samples/uscxml/test-expect.scxml
+++ b/test/uscxml/test-expect.scxml
diff --git a/test/samples/uscxml/test-ffmpeg.scxml b/test/uscxml/test-ffmpeg.scxml
index 7897a27..7897a27 100644
--- a/test/samples/uscxml/test-ffmpeg.scxml
+++ b/test/uscxml/test-ffmpeg.scxml
diff --git a/test/samples/uscxml/test-file-element.scxml b/test/uscxml/test-file-element.scxml
index baeafae..baeafae 100644
--- a/test/samples/uscxml/test-file-element.scxml
+++ b/test/uscxml/test-file-element.scxml
diff --git a/test/samples/uscxml/test-http-servlet.scxml b/test/uscxml/test-http-servlet.scxml
index 8836b76..8836b76 100644
--- a/test/samples/uscxml/test-http-servlet.scxml
+++ b/test/uscxml/test-http-servlet.scxml
diff --git a/test/samples/uscxml/test-imap.scxml b/test/uscxml/test-imap.scxml
index 13e4ec2..13e4ec2 100644
--- a/test/samples/uscxml/test-imap.scxml
+++ b/test/uscxml/test-imap.scxml
diff --git a/test/samples/uscxml/test-initial-config.scxml b/test/uscxml/test-initial-config.scxml
index cac0b8a..cac0b8a 100644
--- a/test/samples/uscxml/test-initial-config.scxml
+++ b/test/uscxml/test-initial-config.scxml
diff --git a/test/samples/uscxml/test-instant-messaging.scxml b/test/uscxml/test-instant-messaging.scxml
index dccaa75..dccaa75 100644
--- a/test/samples/uscxml/test-instant-messaging.scxml
+++ b/test/uscxml/test-instant-messaging.scxml
diff --git a/test/samples/uscxml/test-invoked.scxml b/test/uscxml/test-invoked.scxml
index f34ed5c..f34ed5c 100644
--- a/test/samples/uscxml/test-invoked.scxml
+++ b/test/uscxml/test-invoked.scxml
diff --git a/test/samples/uscxml/test-java-datamodel.scxml b/test/uscxml/test-java-datamodel.scxml
index 4ec157c..4ec157c 100644
--- a/test/samples/uscxml/test-java-datamodel.scxml
+++ b/test/uscxml/test-java-datamodel.scxml
diff --git a/test/samples/uscxml/test-java-invoker.scxml b/test/uscxml/test-java-invoker.scxml
index a226913..a226913 100644
--- a/test/samples/uscxml/test-java-invoker.scxml
+++ b/test/uscxml/test-java-invoker.scxml
diff --git a/test/samples/uscxml/test-jvoicexml.scxml b/test/uscxml/test-jvoicexml.scxml
index 691a951..691a951 100644
--- a/test/samples/uscxml/test-jvoicexml.scxml
+++ b/test/uscxml/test-jvoicexml.scxml
diff --git a/test/samples/uscxml/test-markup-passing.scxml b/test/uscxml/test-markup-passing.scxml
index 32866b1..32866b1 100644
--- a/test/samples/uscxml/test-markup-passing.scxml
+++ b/test/uscxml/test-markup-passing.scxml
diff --git a/test/samples/uscxml/test-markup.xml b/test/uscxml/test-markup.xml
index 81da3d2..81da3d2 100644
--- a/test/samples/uscxml/test-markup.xml
+++ b/test/uscxml/test-markup.xml
diff --git a/test/samples/uscxml/test-mmi-events.scxml b/test/uscxml/test-mmi-events.scxml
index 9460a6e..9460a6e 100644
--- a/test/samples/uscxml/test-mmi-events.scxml
+++ b/test/uscxml/test-mmi-events.scxml
diff --git a/test/samples/uscxml/test-mmi-im.scxml b/test/uscxml/test-mmi-im.scxml
index 70cb3b8..70cb3b8 100644
--- a/test/samples/uscxml/test-mmi-im.scxml
+++ b/test/uscxml/test-mmi-im.scxml
diff --git a/test/samples/uscxml/test-mmi-mc.scxml b/test/uscxml/test-mmi-mc.scxml
index e2197ff..e2197ff 100644
--- a/test/samples/uscxml/test-mmi-mc.scxml
+++ b/test/uscxml/test-mmi-mc.scxml
diff --git a/test/samples/uscxml/test-openal.scxml b/test/uscxml/test-openal.scxml
index b17e34b..b17e34b 100644
--- a/test/samples/uscxml/test-openal.scxml
+++ b/test/uscxml/test-openal.scxml
diff --git a/test/samples/uscxml/test-osgconvert.scxml b/test/uscxml/test-osgconvert.scxml
index 90591eb..90591eb 100644
--- a/test/samples/uscxml/test-osgconvert.scxml
+++ b/test/uscxml/test-osgconvert.scxml
diff --git a/test/samples/uscxml/test-performance.scxml b/test/uscxml/test-performance.scxml
index d8e75da..d8e75da 100644
--- a/test/samples/uscxml/test-performance.scxml
+++ b/test/uscxml/test-performance.scxml
diff --git a/test/samples/uscxml/test-postpone-element.scxml b/test/uscxml/test-postpone-element.scxml
index 185f367..185f367 100644
--- a/test/samples/uscxml/test-postpone-element.scxml
+++ b/test/uscxml/test-postpone-element.scxml
diff --git a/test/samples/uscxml/test-predicates.scxml b/test/uscxml/test-predicates.scxml
index 88e05cc..88e05cc 100644
--- a/test/samples/uscxml/test-predicates.scxml
+++ b/test/uscxml/test-predicates.scxml
diff --git a/test/samples/uscxml/test-prolog.scxml b/test/uscxml/test-prolog.scxml
index a0a79cb..a0a79cb 100644
--- a/test/samples/uscxml/test-prolog.scxml
+++ b/test/uscxml/test-prolog.scxml
diff --git a/test/samples/uscxml/test-response-element.scxml b/test/uscxml/test-response-element.scxml
index eb02320..eb02320 100644
--- a/test/samples/uscxml/test-response-element.scxml
+++ b/test/uscxml/test-response-element.scxml
diff --git a/test/samples/uscxml/test-scenegraph.scxml b/test/uscxml/test-scenegraph.scxml
index 0efcd6d..0efcd6d 100644
--- a/test/samples/uscxml/test-scenegraph.scxml
+++ b/test/uscxml/test-scenegraph.scxml
diff --git a/test/samples/uscxml/test-simplest.scxml b/test/uscxml/test-simplest.scxml
index 8e90e38..8e90e38 100644
--- a/test/samples/uscxml/test-simplest.scxml
+++ b/test/uscxml/test-simplest.scxml
diff --git a/test/samples/uscxml/test-smtp.scxml b/test/uscxml/test-smtp.scxml
index 44a0176..44a0176 100644
--- a/test/samples/uscxml/test-smtp.scxml
+++ b/test/uscxml/test-smtp.scxml
diff --git a/test/samples/uscxml/test-spatial-audio.scxml b/test/uscxml/test-spatial-audio.scxml
index 66d06f4..66d06f4 100644
--- a/test/samples/uscxml/test-spatial-audio.scxml
+++ b/test/uscxml/test-spatial-audio.scxml
diff --git a/test/samples/uscxml/test-startup-time.scxml b/test/uscxml/test-startup-time.scxml
index cc10f04..cc10f04 100644
--- a/test/samples/uscxml/test-startup-time.scxml
+++ b/test/uscxml/test-startup-time.scxml
diff --git a/test/samples/uscxml/test-umundo-map-demo.scxml b/test/uscxml/test-umundo-map-demo.scxml
index 0f66587..0f66587 100644
--- a/test/samples/uscxml/test-umundo-map-demo.scxml
+++ b/test/uscxml/test-umundo-map-demo.scxml
diff --git a/test/samples/uscxml/test-umundo-pingpong.scxml b/test/uscxml/test-umundo-pingpong.scxml
index 93be19d..93be19d 100644
--- a/test/samples/uscxml/test-umundo-pingpong.scxml
+++ b/test/uscxml/test-umundo-pingpong.scxml
diff --git a/test/samples/uscxml/test-umundo-rpc.scxml b/test/uscxml/test-umundo-rpc.scxml
index f6e0f70..f6e0f70 100644
--- a/test/samples/uscxml/test-umundo-rpc.scxml
+++ b/test/uscxml/test-umundo-rpc.scxml
diff --git a/test/samples/uscxml/test-umundo-s11n-chat.scxml b/test/uscxml/test-umundo-s11n-chat.scxml
index 4c1ccf3..4c1ccf3 100644
--- a/test/samples/uscxml/test-umundo-s11n-chat.scxml
+++ b/test/uscxml/test-umundo-s11n-chat.scxml
diff --git a/test/samples/uscxml/test-umundo-s11n.scxml b/test/uscxml/test-umundo-s11n.scxml
index 561cca7..561cca7 100644
--- a/test/samples/uscxml/test-umundo-s11n.scxml
+++ b/test/uscxml/test-umundo-s11n.scxml
diff --git a/test/samples/uscxml/test-xhtml-invoker.scxml b/test/uscxml/test-xhtml-invoker.scxml
index aec4db3..aec4db3 100644
--- a/test/samples/uscxml/test-xhtml-invoker.scxml
+++ b/test/uscxml/test-xhtml-invoker.scxml
diff --git a/test/samples/w3c/confEcma.xsl b/test/w3c/confEcma.xsl
index 61d48c6..61d48c6 100644
--- a/test/samples/w3c/confEcma.xsl
+++ b/test/w3c/confEcma.xsl
diff --git a/test/samples/w3c/confXPath.xsl b/test/w3c/confXPath.xsl
index 514752a..514752a 100644
--- a/test/samples/w3c/confXPath.xsl
+++ b/test/w3c/confXPath.xsl
diff --git a/test/samples/w3c/convert-tests.sh b/test/w3c/convert-tests.sh
index 42f8fce..42f8fce 100755
--- a/test/samples/w3c/convert-tests.sh
+++ b/test/w3c/convert-tests.sh
diff --git a/test/samples/w3c/draft/calc.scxml b/test/w3c/draft/calc.scxml
index e854401..e854401 100644
--- a/test/samples/w3c/draft/calc.scxml
+++ b/test/w3c/draft/calc.scxml
diff --git a/test/samples/w3c/xpath/robots.txt b/test/w3c/ecma/robots.txt
index 54f3e01..54f3e01 100644
--- a/test/samples/w3c/xpath/robots.txt
+++ b/test/w3c/ecma/robots.txt
diff --git a/test/samples/w3c/ecma/test144.scxml b/test/w3c/ecma/test144.scxml
index fcec83a..fcec83a 100644
--- a/test/samples/w3c/ecma/test144.scxml
+++ b/test/w3c/ecma/test144.scxml
diff --git a/test/samples/w3c/ecma/test147.scxml b/test/w3c/ecma/test147.scxml
index f877ecf..f877ecf 100644
--- a/test/samples/w3c/ecma/test147.scxml
+++ b/test/w3c/ecma/test147.scxml
diff --git a/test/samples/w3c/ecma/test148.scxml b/test/w3c/ecma/test148.scxml
index acebba7..acebba7 100644
--- a/test/samples/w3c/ecma/test148.scxml
+++ b/test/w3c/ecma/test148.scxml
diff --git a/test/samples/w3c/ecma/test149.scxml b/test/w3c/ecma/test149.scxml
index b7626c6..b7626c6 100644
--- a/test/samples/w3c/ecma/test149.scxml
+++ b/test/w3c/ecma/test149.scxml
diff --git a/test/samples/w3c/ecma/test150.scxml b/test/w3c/ecma/test150.scxml
index 41e1895..41e1895 100644
--- a/test/samples/w3c/ecma/test150.scxml
+++ b/test/w3c/ecma/test150.scxml
diff --git a/test/samples/w3c/ecma/test151.scxml b/test/w3c/ecma/test151.scxml
index 119bb65..119bb65 100644
--- a/test/samples/w3c/ecma/test151.scxml
+++ b/test/w3c/ecma/test151.scxml
diff --git a/test/samples/w3c/ecma/test152.scxml b/test/w3c/ecma/test152.scxml
index 8af51a8..8af51a8 100644
--- a/test/samples/w3c/ecma/test152.scxml
+++ b/test/w3c/ecma/test152.scxml
diff --git a/test/samples/w3c/ecma/test153.scxml b/test/w3c/ecma/test153.scxml
index c46c32d..c46c32d 100644
--- a/test/samples/w3c/ecma/test153.scxml
+++ b/test/w3c/ecma/test153.scxml
diff --git a/test/samples/w3c/ecma/test155.scxml b/test/w3c/ecma/test155.scxml
index 17d3a70..17d3a70 100644
--- a/test/samples/w3c/ecma/test155.scxml
+++ b/test/w3c/ecma/test155.scxml
diff --git a/test/samples/w3c/ecma/test156.scxml b/test/w3c/ecma/test156.scxml
index aa9e2b0..aa9e2b0 100644
--- a/test/samples/w3c/ecma/test156.scxml
+++ b/test/w3c/ecma/test156.scxml
diff --git a/test/samples/w3c/ecma/test158.scxml b/test/w3c/ecma/test158.scxml
index f1a583f..f1a583f 100644
--- a/test/samples/w3c/ecma/test158.scxml
+++ b/test/w3c/ecma/test158.scxml
diff --git a/test/samples/w3c/ecma/test159.scxml b/test/w3c/ecma/test159.scxml
index d7b7821..d7b7821 100644
--- a/test/samples/w3c/ecma/test159.scxml
+++ b/test/w3c/ecma/test159.scxml
diff --git a/test/samples/w3c/ecma/test172.scxml b/test/w3c/ecma/test172.scxml
index 28f2bcb..28f2bcb 100644
--- a/test/samples/w3c/ecma/test172.scxml
+++ b/test/w3c/ecma/test172.scxml
diff --git a/test/samples/w3c/ecma/test173.scxml b/test/w3c/ecma/test173.scxml
index fa2a289..fa2a289 100644
--- a/test/samples/w3c/ecma/test173.scxml
+++ b/test/w3c/ecma/test173.scxml
diff --git a/test/samples/w3c/ecma/test174.scxml b/test/w3c/ecma/test174.scxml
index f78feee..f78feee 100644
--- a/test/samples/w3c/ecma/test174.scxml
+++ b/test/w3c/ecma/test174.scxml
diff --git a/test/samples/w3c/ecma/test175.scxml b/test/w3c/ecma/test175.scxml
index 4876821..4876821 100644
--- a/test/samples/w3c/ecma/test175.scxml
+++ b/test/w3c/ecma/test175.scxml
diff --git a/test/samples/w3c/ecma/test176.scxml b/test/w3c/ecma/test176.scxml
index 4b120ec..4b120ec 100644
--- a/test/samples/w3c/ecma/test176.scxml
+++ b/test/w3c/ecma/test176.scxml
diff --git a/test/samples/w3c/ecma/test178.scxml b/test/w3c/ecma/test178.scxml
index 91b4681..91b4681 100644
--- a/test/samples/w3c/ecma/test178.scxml
+++ b/test/w3c/ecma/test178.scxml
diff --git a/test/samples/w3c/ecma/test179.scxml b/test/w3c/ecma/test179.scxml
index 170b105..170b105 100644
--- a/test/samples/w3c/ecma/test179.scxml
+++ b/test/w3c/ecma/test179.scxml
diff --git a/test/samples/w3c/ecma/test183.scxml b/test/w3c/ecma/test183.scxml
index 2c17ea8..2c17ea8 100644
--- a/test/samples/w3c/ecma/test183.scxml
+++ b/test/w3c/ecma/test183.scxml
diff --git a/test/samples/w3c/ecma/test185.scxml b/test/w3c/ecma/test185.scxml
index cdf8a77..cdf8a77 100644
--- a/test/samples/w3c/ecma/test185.scxml
+++ b/test/w3c/ecma/test185.scxml
diff --git a/test/samples/w3c/ecma/test186.scxml b/test/w3c/ecma/test186.scxml
index 20f0063..20f0063 100644
--- a/test/samples/w3c/ecma/test186.scxml
+++ b/test/w3c/ecma/test186.scxml
diff --git a/test/samples/w3c/ecma/test187.scxml b/test/w3c/ecma/test187.scxml
index d03c16d..d03c16d 100644
--- a/test/samples/w3c/ecma/test187.scxml
+++ b/test/w3c/ecma/test187.scxml
diff --git a/test/samples/w3c/ecma/test189.scxml b/test/w3c/ecma/test189.scxml
index 683b874..683b874 100644
--- a/test/samples/w3c/ecma/test189.scxml
+++ b/test/w3c/ecma/test189.scxml
diff --git a/test/samples/w3c/ecma/test190.scxml b/test/w3c/ecma/test190.scxml
index a1f6d56..a1f6d56 100644
--- a/test/samples/w3c/ecma/test190.scxml
+++ b/test/w3c/ecma/test190.scxml
diff --git a/test/samples/w3c/ecma/test191.scxml b/test/w3c/ecma/test191.scxml
index 6e82274..6e82274 100644
--- a/test/samples/w3c/ecma/test191.scxml
+++ b/test/w3c/ecma/test191.scxml
diff --git a/test/samples/w3c/ecma/test192.scxml b/test/w3c/ecma/test192.scxml
index a74a05e..a74a05e 100644
--- a/test/samples/w3c/ecma/test192.scxml
+++ b/test/w3c/ecma/test192.scxml
diff --git a/test/samples/w3c/ecma/test193.scxml b/test/w3c/ecma/test193.scxml
index 441a658..441a658 100644
--- a/test/samples/w3c/ecma/test193.scxml
+++ b/test/w3c/ecma/test193.scxml
diff --git a/test/samples/w3c/ecma/test194.scxml b/test/w3c/ecma/test194.scxml
index e7dcd76..e7dcd76 100644
--- a/test/samples/w3c/ecma/test194.scxml
+++ b/test/w3c/ecma/test194.scxml
diff --git a/test/samples/w3c/ecma/test198.scxml b/test/w3c/ecma/test198.scxml
index e804625..e804625 100644
--- a/test/samples/w3c/ecma/test198.scxml
+++ b/test/w3c/ecma/test198.scxml
diff --git a/test/samples/w3c/ecma/test199.scxml b/test/w3c/ecma/test199.scxml
index 2119cd8..2119cd8 100644
--- a/test/samples/w3c/ecma/test199.scxml
+++ b/test/w3c/ecma/test199.scxml
diff --git a/test/samples/w3c/ecma/test200.scxml b/test/w3c/ecma/test200.scxml
index 2aa85a9..2aa85a9 100644
--- a/test/samples/w3c/ecma/test200.scxml
+++ b/test/w3c/ecma/test200.scxml
diff --git a/test/samples/w3c/ecma/test201.scxml b/test/w3c/ecma/test201.scxml
index 8ded0d5..8ded0d5 100644
--- a/test/samples/w3c/ecma/test201.scxml
+++ b/test/w3c/ecma/test201.scxml
diff --git a/test/samples/w3c/ecma/test205.scxml b/test/w3c/ecma/test205.scxml
index 5adefbe..5adefbe 100644
--- a/test/samples/w3c/ecma/test205.scxml
+++ b/test/w3c/ecma/test205.scxml
diff --git a/test/samples/w3c/ecma/test207.scxml b/test/w3c/ecma/test207.scxml
index aa5786a..aa5786a 100644
--- a/test/samples/w3c/ecma/test207.scxml
+++ b/test/w3c/ecma/test207.scxml
diff --git a/test/samples/w3c/ecma/test208.scxml b/test/w3c/ecma/test208.scxml
index 6faa9c1..6faa9c1 100644
--- a/test/samples/w3c/ecma/test208.scxml
+++ b/test/w3c/ecma/test208.scxml
diff --git a/test/samples/w3c/ecma/test210.scxml b/test/w3c/ecma/test210.scxml
index e29b65d..e29b65d 100644
--- a/test/samples/w3c/ecma/test210.scxml
+++ b/test/w3c/ecma/test210.scxml
diff --git a/test/samples/w3c/ecma/test215.scxml b/test/w3c/ecma/test215.scxml
index 97e6a39..97e6a39 100644
--- a/test/samples/w3c/ecma/test215.scxml
+++ b/test/w3c/ecma/test215.scxml
diff --git a/test/samples/w3c/ecma/test216.scxml b/test/w3c/ecma/test216.scxml
index 97b2a77..97b2a77 100644
--- a/test/samples/w3c/ecma/test216.scxml
+++ b/test/w3c/ecma/test216.scxml
diff --git a/test/samples/w3c/ecma/test216sub1.scxml b/test/w3c/ecma/test216sub1.scxml
index 3c3a88d..3c3a88d 100644
--- a/test/samples/w3c/ecma/test216sub1.scxml
+++ b/test/w3c/ecma/test216sub1.scxml
diff --git a/test/samples/w3c/ecma/test220.scxml b/test/w3c/ecma/test220.scxml
index 2d447c4..2d447c4 100644
--- a/test/samples/w3c/ecma/test220.scxml
+++ b/test/w3c/ecma/test220.scxml
diff --git a/test/samples/w3c/ecma/test223.scxml b/test/w3c/ecma/test223.scxml
index 63ceadd..63ceadd 100644
--- a/test/samples/w3c/ecma/test223.scxml
+++ b/test/w3c/ecma/test223.scxml
diff --git a/test/samples/w3c/ecma/test224.scxml b/test/w3c/ecma/test224.scxml
index e2e8a32..e2e8a32 100644
--- a/test/samples/w3c/ecma/test224.scxml
+++ b/test/w3c/ecma/test224.scxml
diff --git a/test/samples/w3c/ecma/test225.scxml b/test/w3c/ecma/test225.scxml
index 467d1ba..467d1ba 100644
--- a/test/samples/w3c/ecma/test225.scxml
+++ b/test/w3c/ecma/test225.scxml
diff --git a/test/samples/w3c/ecma/test226.scxml b/test/w3c/ecma/test226.scxml
index e1c6d3f..e1c6d3f 100644
--- a/test/samples/w3c/ecma/test226.scxml
+++ b/test/w3c/ecma/test226.scxml
diff --git a/test/samples/w3c/ecma/test226sub1.scxml b/test/w3c/ecma/test226sub1.scxml
index 809efb0..809efb0 100644
--- a/test/samples/w3c/ecma/test226sub1.scxml
+++ b/test/w3c/ecma/test226sub1.scxml
diff --git a/test/samples/w3c/ecma/test228.scxml b/test/w3c/ecma/test228.scxml
index b44de56..b44de56 100644
--- a/test/samples/w3c/ecma/test228.scxml
+++ b/test/w3c/ecma/test228.scxml
diff --git a/test/samples/w3c/ecma/test229.scxml b/test/w3c/ecma/test229.scxml
index e3aeecb..e3aeecb 100644
--- a/test/samples/w3c/ecma/test229.scxml
+++ b/test/w3c/ecma/test229.scxml
diff --git a/test/samples/w3c/ecma/test230.scxml b/test/w3c/ecma/test230.scxml
index ae13476..ae13476 100644
--- a/test/samples/w3c/ecma/test230.scxml
+++ b/test/w3c/ecma/test230.scxml
diff --git a/test/samples/w3c/ecma/test232.scxml b/test/w3c/ecma/test232.scxml
index 9515e15..9515e15 100644
--- a/test/samples/w3c/ecma/test232.scxml
+++ b/test/w3c/ecma/test232.scxml
diff --git a/test/samples/w3c/ecma/test233.scxml b/test/w3c/ecma/test233.scxml
index 3900d28..3900d28 100644
--- a/test/samples/w3c/ecma/test233.scxml
+++ b/test/w3c/ecma/test233.scxml
diff --git a/test/samples/w3c/ecma/test234.scxml b/test/w3c/ecma/test234.scxml
index b874fe9..b874fe9 100644
--- a/test/samples/w3c/ecma/test234.scxml
+++ b/test/w3c/ecma/test234.scxml
diff --git a/test/samples/w3c/ecma/test235.scxml b/test/w3c/ecma/test235.scxml
index 17d0cf0..17d0cf0 100644
--- a/test/samples/w3c/ecma/test235.scxml
+++ b/test/w3c/ecma/test235.scxml
diff --git a/test/samples/w3c/ecma/test236.scxml b/test/w3c/ecma/test236.scxml
index 700c6f8..700c6f8 100644
--- a/test/samples/w3c/ecma/test236.scxml
+++ b/test/w3c/ecma/test236.scxml
diff --git a/test/samples/w3c/ecma/test237.scxml b/test/w3c/ecma/test237.scxml
index b23811d..b23811d 100644
--- a/test/samples/w3c/ecma/test237.scxml
+++ b/test/w3c/ecma/test237.scxml
diff --git a/test/samples/w3c/ecma/test239.scxml b/test/w3c/ecma/test239.scxml
index 4fcfc92..4fcfc92 100644
--- a/test/samples/w3c/ecma/test239.scxml
+++ b/test/w3c/ecma/test239.scxml
diff --git a/test/samples/w3c/ecma/test239sub1.scxml b/test/w3c/ecma/test239sub1.scxml
index 0f099d3..0f099d3 100644
--- a/test/samples/w3c/ecma/test239sub1.scxml
+++ b/test/w3c/ecma/test239sub1.scxml
diff --git a/test/samples/w3c/ecma/test240.scxml b/test/w3c/ecma/test240.scxml
index 6d74d4c..6d74d4c 100644
--- a/test/samples/w3c/ecma/test240.scxml
+++ b/test/w3c/ecma/test240.scxml
diff --git a/test/samples/w3c/ecma/test241.scxml b/test/w3c/ecma/test241.scxml
index af1471f..af1471f 100644
--- a/test/samples/w3c/ecma/test241.scxml
+++ b/test/w3c/ecma/test241.scxml
diff --git a/test/samples/w3c/ecma/test242.scxml b/test/w3c/ecma/test242.scxml
index f0fa504..f0fa504 100644
--- a/test/samples/w3c/ecma/test242.scxml
+++ b/test/w3c/ecma/test242.scxml
diff --git a/test/samples/w3c/ecma/test242sub1.scxml b/test/w3c/ecma/test242sub1.scxml
index 0f099d3..0f099d3 100644
--- a/test/samples/w3c/ecma/test242sub1.scxml
+++ b/test/w3c/ecma/test242sub1.scxml
diff --git a/test/samples/w3c/ecma/test243.scxml b/test/w3c/ecma/test243.scxml
index 18f2175..18f2175 100644
--- a/test/samples/w3c/ecma/test243.scxml
+++ b/test/w3c/ecma/test243.scxml
diff --git a/test/samples/w3c/ecma/test244.scxml b/test/w3c/ecma/test244.scxml
index d251c59..d251c59 100644
--- a/test/samples/w3c/ecma/test244.scxml
+++ b/test/w3c/ecma/test244.scxml
diff --git a/test/samples/w3c/ecma/test245.scxml b/test/w3c/ecma/test245.scxml
index 58838b2..58838b2 100644
--- a/test/samples/w3c/ecma/test245.scxml
+++ b/test/w3c/ecma/test245.scxml
diff --git a/test/samples/w3c/ecma/test247.scxml b/test/w3c/ecma/test247.scxml
index b543bf1..b543bf1 100644
--- a/test/samples/w3c/ecma/test247.scxml
+++ b/test/w3c/ecma/test247.scxml
diff --git a/test/samples/w3c/ecma/test250.scxml b/test/w3c/ecma/test250.scxml
index f5228ab..f5228ab 100644
--- a/test/samples/w3c/ecma/test250.scxml
+++ b/test/w3c/ecma/test250.scxml
diff --git a/test/samples/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml
index 14c6686..14c6686 100644
--- a/test/samples/w3c/ecma/test252.scxml
+++ b/test/w3c/ecma/test252.scxml
diff --git a/test/samples/w3c/ecma/test253.scxml b/test/w3c/ecma/test253.scxml
index e8924ec..e8924ec 100644
--- a/test/samples/w3c/ecma/test253.scxml
+++ b/test/w3c/ecma/test253.scxml
diff --git a/test/samples/w3c/ecma/test276.scxml b/test/w3c/ecma/test276.scxml
index 233c171..233c171 100644
--- a/test/samples/w3c/ecma/test276.scxml
+++ b/test/w3c/ecma/test276.scxml
diff --git a/test/samples/w3c/ecma/test276sub1.scxml b/test/w3c/ecma/test276sub1.scxml
index b18ceb2..b18ceb2 100644
--- a/test/samples/w3c/ecma/test276sub1.scxml
+++ b/test/w3c/ecma/test276sub1.scxml
diff --git a/test/samples/w3c/ecma/test277.scxml b/test/w3c/ecma/test277.scxml
index eb6a1ee..eb6a1ee 100644
--- a/test/samples/w3c/ecma/test277.scxml
+++ b/test/w3c/ecma/test277.scxml
diff --git a/test/samples/w3c/ecma/test278.scxml b/test/w3c/ecma/test278.scxml
index b26c6f2..b26c6f2 100644
--- a/test/samples/w3c/ecma/test278.scxml
+++ b/test/w3c/ecma/test278.scxml
diff --git a/test/samples/w3c/ecma/test279.scxml b/test/w3c/ecma/test279.scxml
index 2de6fd2..2de6fd2 100644
--- a/test/samples/w3c/ecma/test279.scxml
+++ b/test/w3c/ecma/test279.scxml
diff --git a/test/samples/w3c/ecma/test280.scxml b/test/w3c/ecma/test280.scxml
index 78865bf..78865bf 100644
--- a/test/samples/w3c/ecma/test280.scxml
+++ b/test/w3c/ecma/test280.scxml
diff --git a/test/samples/w3c/ecma/test286.scxml b/test/w3c/ecma/test286.scxml
index 596f2ba..596f2ba 100644
--- a/test/samples/w3c/ecma/test286.scxml
+++ b/test/w3c/ecma/test286.scxml
diff --git a/test/samples/w3c/ecma/test287.scxml b/test/w3c/ecma/test287.scxml
index 030c6b5..030c6b5 100644
--- a/test/samples/w3c/ecma/test287.scxml
+++ b/test/w3c/ecma/test287.scxml
diff --git a/test/samples/w3c/ecma/test294.scxml b/test/w3c/ecma/test294.scxml
index efd26f4..efd26f4 100644
--- a/test/samples/w3c/ecma/test294.scxml
+++ b/test/w3c/ecma/test294.scxml
diff --git a/test/samples/w3c/ecma/test298.scxml b/test/w3c/ecma/test298.scxml
index 6a82a95..6a82a95 100644
--- a/test/samples/w3c/ecma/test298.scxml
+++ b/test/w3c/ecma/test298.scxml
diff --git a/test/samples/w3c/xpath/test301.scxml b/test/w3c/ecma/test301.scxml
index 59125c8..59125c8 100644
--- a/test/samples/w3c/xpath/test301.scxml
+++ b/test/w3c/ecma/test301.scxml
diff --git a/test/samples/w3c/ecma/test302.scxml b/test/w3c/ecma/test302.scxml
index 166b4fc..166b4fc 100644
--- a/test/samples/w3c/ecma/test302.scxml
+++ b/test/w3c/ecma/test302.scxml
diff --git a/test/samples/w3c/ecma/test303.scxml b/test/w3c/ecma/test303.scxml
index 0b1e11c..0b1e11c 100644
--- a/test/samples/w3c/ecma/test303.scxml
+++ b/test/w3c/ecma/test303.scxml
diff --git a/test/samples/w3c/ecma/test304.scxml b/test/w3c/ecma/test304.scxml
index 250d0cd..250d0cd 100644
--- a/test/samples/w3c/ecma/test304.scxml
+++ b/test/w3c/ecma/test304.scxml
diff --git a/test/samples/w3c/ecma/test307.scxml b/test/w3c/ecma/test307.scxml
index 3f93f10..3f93f10 100644
--- a/test/samples/w3c/ecma/test307.scxml
+++ b/test/w3c/ecma/test307.scxml
diff --git a/test/samples/w3c/ecma/test309.scxml b/test/w3c/ecma/test309.scxml
index 7ac405c..7ac405c 100644
--- a/test/samples/w3c/ecma/test309.scxml
+++ b/test/w3c/ecma/test309.scxml
diff --git a/test/samples/w3c/ecma/test310.scxml b/test/w3c/ecma/test310.scxml
index e939ded..e939ded 100644
--- a/test/samples/w3c/ecma/test310.scxml
+++ b/test/w3c/ecma/test310.scxml
diff --git a/test/samples/w3c/ecma/test311.scxml b/test/w3c/ecma/test311.scxml
index 851f3ad..851f3ad 100644
--- a/test/samples/w3c/ecma/test311.scxml
+++ b/test/w3c/ecma/test311.scxml
diff --git a/test/samples/w3c/ecma/test312.scxml b/test/w3c/ecma/test312.scxml
index a9741e5..a9741e5 100644
--- a/test/samples/w3c/ecma/test312.scxml
+++ b/test/w3c/ecma/test312.scxml
diff --git a/test/samples/w3c/ecma/test313.scxml b/test/w3c/ecma/test313.scxml
index fcec4ac..fcec4ac 100644
--- a/test/samples/w3c/ecma/test313.scxml
+++ b/test/w3c/ecma/test313.scxml
diff --git a/test/samples/w3c/ecma/test314.scxml b/test/w3c/ecma/test314.scxml
index ed78e79..ed78e79 100644
--- a/test/samples/w3c/ecma/test314.scxml
+++ b/test/w3c/ecma/test314.scxml
diff --git a/test/samples/w3c/ecma/test318.scxml b/test/w3c/ecma/test318.scxml
index 15bf7f8..15bf7f8 100644
--- a/test/samples/w3c/ecma/test318.scxml
+++ b/test/w3c/ecma/test318.scxml
diff --git a/test/samples/w3c/ecma/test319.scxml b/test/w3c/ecma/test319.scxml
index adac328..adac328 100644
--- a/test/samples/w3c/ecma/test319.scxml
+++ b/test/w3c/ecma/test319.scxml
diff --git a/test/samples/w3c/ecma/test321.scxml b/test/w3c/ecma/test321.scxml
index 66fcf58..66fcf58 100644
--- a/test/samples/w3c/ecma/test321.scxml
+++ b/test/w3c/ecma/test321.scxml
diff --git a/test/samples/w3c/ecma/test322.scxml b/test/w3c/ecma/test322.scxml
index 2d0fee1..2d0fee1 100644
--- a/test/samples/w3c/ecma/test322.scxml
+++ b/test/w3c/ecma/test322.scxml
diff --git a/test/samples/w3c/ecma/test323.scxml b/test/w3c/ecma/test323.scxml
index 43fa9c8..43fa9c8 100644
--- a/test/samples/w3c/ecma/test323.scxml
+++ b/test/w3c/ecma/test323.scxml
diff --git a/test/samples/w3c/ecma/test324.scxml b/test/w3c/ecma/test324.scxml
index 7e5023e..7e5023e 100644
--- a/test/samples/w3c/ecma/test324.scxml
+++ b/test/w3c/ecma/test324.scxml
diff --git a/test/samples/w3c/ecma/test325.scxml b/test/w3c/ecma/test325.scxml
index eaa4c22..eaa4c22 100644
--- a/test/samples/w3c/ecma/test325.scxml
+++ b/test/w3c/ecma/test325.scxml
diff --git a/test/samples/w3c/ecma/test326.scxml b/test/w3c/ecma/test326.scxml
index f18a661..f18a661 100644
--- a/test/samples/w3c/ecma/test326.scxml
+++ b/test/w3c/ecma/test326.scxml
diff --git a/test/samples/w3c/ecma/test329.scxml b/test/w3c/ecma/test329.scxml
index 9a95643..9a95643 100644
--- a/test/samples/w3c/ecma/test329.scxml
+++ b/test/w3c/ecma/test329.scxml
diff --git a/test/samples/w3c/ecma/test330.scxml b/test/w3c/ecma/test330.scxml
index 5cbf4bc..5cbf4bc 100644
--- a/test/samples/w3c/ecma/test330.scxml
+++ b/test/w3c/ecma/test330.scxml
diff --git a/test/samples/w3c/ecma/test331.scxml b/test/w3c/ecma/test331.scxml
index e1271f0..e1271f0 100644
--- a/test/samples/w3c/ecma/test331.scxml
+++ b/test/w3c/ecma/test331.scxml
diff --git a/test/samples/w3c/ecma/test332.scxml b/test/w3c/ecma/test332.scxml
index da68cf4..da68cf4 100644
--- a/test/samples/w3c/ecma/test332.scxml
+++ b/test/w3c/ecma/test332.scxml
diff --git a/test/samples/w3c/ecma/test333.scxml b/test/w3c/ecma/test333.scxml
index 9e06896..9e06896 100644
--- a/test/samples/w3c/ecma/test333.scxml
+++ b/test/w3c/ecma/test333.scxml
diff --git a/test/samples/w3c/ecma/test335.scxml b/test/w3c/ecma/test335.scxml
index a56074a..a56074a 100644
--- a/test/samples/w3c/ecma/test335.scxml
+++ b/test/w3c/ecma/test335.scxml
diff --git a/test/samples/w3c/ecma/test336.scxml b/test/w3c/ecma/test336.scxml
index 92bd3dd..92bd3dd 100644
--- a/test/samples/w3c/ecma/test336.scxml
+++ b/test/w3c/ecma/test336.scxml
diff --git a/test/samples/w3c/ecma/test337.scxml b/test/w3c/ecma/test337.scxml
index 71092a8..71092a8 100644
--- a/test/samples/w3c/ecma/test337.scxml
+++ b/test/w3c/ecma/test337.scxml
diff --git a/test/samples/w3c/ecma/test338.scxml b/test/w3c/ecma/test338.scxml
index fef53be..fef53be 100644
--- a/test/samples/w3c/ecma/test338.scxml
+++ b/test/w3c/ecma/test338.scxml
diff --git a/test/samples/w3c/ecma/test339.scxml b/test/w3c/ecma/test339.scxml
index 82864c9..82864c9 100644
--- a/test/samples/w3c/ecma/test339.scxml
+++ b/test/w3c/ecma/test339.scxml
diff --git a/test/samples/w3c/ecma/test342.scxml b/test/w3c/ecma/test342.scxml
index 2934704..2934704 100644
--- a/test/samples/w3c/ecma/test342.scxml
+++ b/test/w3c/ecma/test342.scxml
diff --git a/test/samples/w3c/ecma/test343.scxml b/test/w3c/ecma/test343.scxml
index 7f15cf0..7f15cf0 100644
--- a/test/samples/w3c/ecma/test343.scxml
+++ b/test/w3c/ecma/test343.scxml
diff --git a/test/samples/w3c/ecma/test344.scxml b/test/w3c/ecma/test344.scxml
index 068581d..068581d 100644
--- a/test/samples/w3c/ecma/test344.scxml
+++ b/test/w3c/ecma/test344.scxml
diff --git a/test/samples/w3c/ecma/test346.scxml b/test/w3c/ecma/test346.scxml
index 622de71..622de71 100644
--- a/test/samples/w3c/ecma/test346.scxml
+++ b/test/w3c/ecma/test346.scxml
diff --git a/test/samples/w3c/ecma/test347.scxml b/test/w3c/ecma/test347.scxml
index 7ed7cca..7ed7cca 100644
--- a/test/samples/w3c/ecma/test347.scxml
+++ b/test/w3c/ecma/test347.scxml
diff --git a/test/samples/w3c/ecma/test348.scxml b/test/w3c/ecma/test348.scxml
index dc4b301..dc4b301 100644
--- a/test/samples/w3c/ecma/test348.scxml
+++ b/test/w3c/ecma/test348.scxml
diff --git a/test/samples/w3c/ecma/test349.scxml b/test/w3c/ecma/test349.scxml
index 7fe2408..7fe2408 100644
--- a/test/samples/w3c/ecma/test349.scxml
+++ b/test/w3c/ecma/test349.scxml
diff --git a/test/samples/w3c/ecma/test350.scxml b/test/w3c/ecma/test350.scxml
index b401ab1..b401ab1 100644
--- a/test/samples/w3c/ecma/test350.scxml
+++ b/test/w3c/ecma/test350.scxml
diff --git a/test/samples/w3c/ecma/test351.scxml b/test/w3c/ecma/test351.scxml
index a308a14..a308a14 100644
--- a/test/samples/w3c/ecma/test351.scxml
+++ b/test/w3c/ecma/test351.scxml
diff --git a/test/samples/w3c/ecma/test352.scxml b/test/w3c/ecma/test352.scxml
index 513089a..513089a 100644
--- a/test/samples/w3c/ecma/test352.scxml
+++ b/test/w3c/ecma/test352.scxml
diff --git a/test/samples/w3c/ecma/test354.scxml b/test/w3c/ecma/test354.scxml
index 3a3c33b..3a3c33b 100644
--- a/test/samples/w3c/ecma/test354.scxml
+++ b/test/w3c/ecma/test354.scxml
diff --git a/test/samples/w3c/ecma/test355.scxml b/test/w3c/ecma/test355.scxml
index 6a77251..6a77251 100644
--- a/test/samples/w3c/ecma/test355.scxml
+++ b/test/w3c/ecma/test355.scxml
diff --git a/test/samples/w3c/ecma/test364.scxml b/test/w3c/ecma/test364.scxml
index ac57647..ac57647 100644
--- a/test/samples/w3c/ecma/test364.scxml
+++ b/test/w3c/ecma/test364.scxml
diff --git a/test/samples/w3c/ecma/test372.scxml b/test/w3c/ecma/test372.scxml
index 9b6c7ec..9b6c7ec 100644
--- a/test/samples/w3c/ecma/test372.scxml
+++ b/test/w3c/ecma/test372.scxml
diff --git a/test/samples/w3c/ecma/test375.scxml b/test/w3c/ecma/test375.scxml
index 1652588..1652588 100644
--- a/test/samples/w3c/ecma/test375.scxml
+++ b/test/w3c/ecma/test375.scxml
diff --git a/test/samples/w3c/ecma/test376.scxml b/test/w3c/ecma/test376.scxml
index 1da5a9a..1da5a9a 100644
--- a/test/samples/w3c/ecma/test376.scxml
+++ b/test/w3c/ecma/test376.scxml
diff --git a/test/samples/w3c/ecma/test377.scxml b/test/w3c/ecma/test377.scxml
index 49549c8..49549c8 100644
--- a/test/samples/w3c/ecma/test377.scxml
+++ b/test/w3c/ecma/test377.scxml
diff --git a/test/samples/w3c/ecma/test378.scxml b/test/w3c/ecma/test378.scxml
index 34501fb..34501fb 100644
--- a/test/samples/w3c/ecma/test378.scxml
+++ b/test/w3c/ecma/test378.scxml
diff --git a/test/samples/w3c/ecma/test387.scxml b/test/w3c/ecma/test387.scxml
index 35fb910..35fb910 100644
--- a/test/samples/w3c/ecma/test387.scxml
+++ b/test/w3c/ecma/test387.scxml
diff --git a/test/samples/w3c/ecma/test388.scxml b/test/w3c/ecma/test388.scxml
index 6a93fd0..6a93fd0 100644
--- a/test/samples/w3c/ecma/test388.scxml
+++ b/test/w3c/ecma/test388.scxml
diff --git a/test/samples/w3c/ecma/test396.scxml b/test/w3c/ecma/test396.scxml
index dbbb124..dbbb124 100644
--- a/test/samples/w3c/ecma/test396.scxml
+++ b/test/w3c/ecma/test396.scxml
diff --git a/test/samples/w3c/ecma/test399.scxml b/test/w3c/ecma/test399.scxml
index e5a951e..e5a951e 100644
--- a/test/samples/w3c/ecma/test399.scxml
+++ b/test/w3c/ecma/test399.scxml
diff --git a/test/samples/w3c/ecma/test401.scxml b/test/w3c/ecma/test401.scxml
index 9ce7217..9ce7217 100644
--- a/test/samples/w3c/ecma/test401.scxml
+++ b/test/w3c/ecma/test401.scxml
diff --git a/test/samples/w3c/ecma/test402.scxml b/test/w3c/ecma/test402.scxml
index 104483d..104483d 100644
--- a/test/samples/w3c/ecma/test402.scxml
+++ b/test/w3c/ecma/test402.scxml
diff --git a/test/samples/w3c/ecma/test403a.scxml b/test/w3c/ecma/test403a.scxml
index 89a4ad9..89a4ad9 100644
--- a/test/samples/w3c/ecma/test403a.scxml
+++ b/test/w3c/ecma/test403a.scxml
diff --git a/test/samples/w3c/ecma/test403b.scxml b/test/w3c/ecma/test403b.scxml
index 18acfb5..18acfb5 100644
--- a/test/samples/w3c/ecma/test403b.scxml
+++ b/test/w3c/ecma/test403b.scxml
diff --git a/test/samples/w3c/ecma/test403c.scxml b/test/w3c/ecma/test403c.scxml
index 9e7fd12..9e7fd12 100644
--- a/test/samples/w3c/ecma/test403c.scxml
+++ b/test/w3c/ecma/test403c.scxml
diff --git a/test/samples/w3c/ecma/test404.scxml b/test/w3c/ecma/test404.scxml
index ad6bb24..ad6bb24 100644
--- a/test/samples/w3c/ecma/test404.scxml
+++ b/test/w3c/ecma/test404.scxml
diff --git a/test/samples/w3c/ecma/test405.scxml b/test/w3c/ecma/test405.scxml
index 114cf22..114cf22 100644
--- a/test/samples/w3c/ecma/test405.scxml
+++ b/test/w3c/ecma/test405.scxml
diff --git a/test/samples/w3c/ecma/test406.scxml b/test/w3c/ecma/test406.scxml
index a8f8f99..a8f8f99 100644
--- a/test/samples/w3c/ecma/test406.scxml
+++ b/test/w3c/ecma/test406.scxml
diff --git a/test/samples/w3c/ecma/test407.scxml b/test/w3c/ecma/test407.scxml
index 0407c99..0407c99 100644
--- a/test/samples/w3c/ecma/test407.scxml
+++ b/test/w3c/ecma/test407.scxml
diff --git a/test/samples/w3c/ecma/test409.scxml b/test/w3c/ecma/test409.scxml
index 9b4f1aa..9b4f1aa 100644
--- a/test/samples/w3c/ecma/test409.scxml
+++ b/test/w3c/ecma/test409.scxml
diff --git a/test/samples/w3c/ecma/test411.scxml b/test/w3c/ecma/test411.scxml
index 8e1c673..8e1c673 100644
--- a/test/samples/w3c/ecma/test411.scxml
+++ b/test/w3c/ecma/test411.scxml
diff --git a/test/samples/w3c/ecma/test412.scxml b/test/w3c/ecma/test412.scxml
index 4a8b26a..4a8b26a 100644
--- a/test/samples/w3c/ecma/test412.scxml
+++ b/test/w3c/ecma/test412.scxml
diff --git a/test/samples/w3c/ecma/test413.scxml b/test/w3c/ecma/test413.scxml
index 94e32a2..94e32a2 100644
--- a/test/samples/w3c/ecma/test413.scxml
+++ b/test/w3c/ecma/test413.scxml
diff --git a/test/samples/w3c/ecma/test415.scxml b/test/w3c/ecma/test415.scxml
index 159218b..159218b 100644
--- a/test/samples/w3c/ecma/test415.scxml
+++ b/test/w3c/ecma/test415.scxml
diff --git a/test/samples/w3c/ecma/test416.scxml b/test/w3c/ecma/test416.scxml
index 45799e4..45799e4 100644
--- a/test/samples/w3c/ecma/test416.scxml
+++ b/test/w3c/ecma/test416.scxml
diff --git a/test/samples/w3c/ecma/test417.scxml b/test/w3c/ecma/test417.scxml
index 5ca6144..5ca6144 100644
--- a/test/samples/w3c/ecma/test417.scxml
+++ b/test/w3c/ecma/test417.scxml
diff --git a/test/samples/w3c/ecma/test419.scxml b/test/w3c/ecma/test419.scxml
index c4de17e..c4de17e 100644
--- a/test/samples/w3c/ecma/test419.scxml
+++ b/test/w3c/ecma/test419.scxml
diff --git a/test/samples/w3c/ecma/test421.scxml b/test/w3c/ecma/test421.scxml
index 1747334..1747334 100644
--- a/test/samples/w3c/ecma/test421.scxml
+++ b/test/w3c/ecma/test421.scxml
diff --git a/test/samples/w3c/ecma/test422.scxml b/test/w3c/ecma/test422.scxml
index 803f75f..803f75f 100644
--- a/test/samples/w3c/ecma/test422.scxml
+++ b/test/w3c/ecma/test422.scxml
diff --git a/test/samples/w3c/ecma/test423.scxml b/test/w3c/ecma/test423.scxml
index f6287ab..f6287ab 100644
--- a/test/samples/w3c/ecma/test423.scxml
+++ b/test/w3c/ecma/test423.scxml
diff --git a/test/samples/w3c/xpath/test436.scxml b/test/w3c/ecma/test436.scxml
index d8b2ca2..d8b2ca2 100644
--- a/test/samples/w3c/xpath/test436.scxml
+++ b/test/w3c/ecma/test436.scxml
diff --git a/test/samples/w3c/xpath/test444.scxml b/test/w3c/ecma/test444.scxml
index c689674..c689674 100644
--- a/test/samples/w3c/xpath/test444.scxml
+++ b/test/w3c/ecma/test444.scxml
diff --git a/test/samples/w3c/xpath/test445.scxml b/test/w3c/ecma/test445.scxml
index f1ae24b..f1ae24b 100644
--- a/test/samples/w3c/xpath/test445.scxml
+++ b/test/w3c/ecma/test445.scxml
diff --git a/test/samples/w3c/xpath/test448.scxml b/test/w3c/ecma/test448.scxml
index adbc121..adbc121 100644
--- a/test/samples/w3c/xpath/test448.scxml
+++ b/test/w3c/ecma/test448.scxml
diff --git a/test/samples/w3c/xpath/test449.scxml b/test/w3c/ecma/test449.scxml
index d06cc9a..d06cc9a 100644
--- a/test/samples/w3c/xpath/test449.scxml
+++ b/test/w3c/ecma/test449.scxml
diff --git a/test/samples/w3c/xpath/test451.scxml b/test/w3c/ecma/test451.scxml
index e939ded..e939ded 100644
--- a/test/samples/w3c/xpath/test451.scxml
+++ b/test/w3c/ecma/test451.scxml
diff --git a/test/samples/w3c/xpath/test452.scxml b/test/w3c/ecma/test452.scxml
index 4f38ca7..4f38ca7 100644
--- a/test/samples/w3c/xpath/test452.scxml
+++ b/test/w3c/ecma/test452.scxml
diff --git a/test/samples/w3c/xpath/test453.scxml b/test/w3c/ecma/test453.scxml
index 33b904d..33b904d 100644
--- a/test/samples/w3c/xpath/test453.scxml
+++ b/test/w3c/ecma/test453.scxml
diff --git a/test/samples/w3c/ecma/test456.scxml b/test/w3c/ecma/test456.scxml
index 2865fb2..2865fb2 100644
--- a/test/samples/w3c/ecma/test456.scxml
+++ b/test/w3c/ecma/test456.scxml
diff --git a/test/samples/w3c/xpath/test457.scxml b/test/w3c/ecma/test457.scxml
index 86cf156..86cf156 100644
--- a/test/samples/w3c/xpath/test457.scxml
+++ b/test/w3c/ecma/test457.scxml
diff --git a/test/samples/w3c/xpath/test460.scxml b/test/w3c/ecma/test460.scxml
index 8ba3e5e..8ba3e5e 100644
--- a/test/samples/w3c/xpath/test460.scxml
+++ b/test/w3c/ecma/test460.scxml
diff --git a/test/samples/w3c/xpath/test463.scxml b/test/w3c/ecma/test463.scxml
index 4f32b84..4f32b84 100644
--- a/test/samples/w3c/xpath/test463.scxml
+++ b/test/w3c/ecma/test463.scxml
diff --git a/test/samples/w3c/xpath/test464.scxml b/test/w3c/ecma/test464.scxml
index bd640f2..bd640f2 100644
--- a/test/samples/w3c/xpath/test464.scxml
+++ b/test/w3c/ecma/test464.scxml
diff --git a/test/samples/w3c/xpath/test465.scxml b/test/w3c/ecma/test465.scxml
index a91bb06..a91bb06 100644
--- a/test/samples/w3c/xpath/test465.scxml
+++ b/test/w3c/ecma/test465.scxml
diff --git a/test/samples/w3c/xpath/test466.scxml b/test/w3c/ecma/test466.scxml
index 1431fab..1431fab 100644
--- a/test/samples/w3c/xpath/test466.scxml
+++ b/test/w3c/ecma/test466.scxml
diff --git a/test/samples/w3c/xpath/test467.scxml b/test/w3c/ecma/test467.scxml
index 130b7bc..130b7bc 100644
--- a/test/samples/w3c/xpath/test467.scxml
+++ b/test/w3c/ecma/test467.scxml
diff --git a/test/samples/w3c/xpath/test468.scxml b/test/w3c/ecma/test468.scxml
index 3b6902d..3b6902d 100644
--- a/test/samples/w3c/xpath/test468.scxml
+++ b/test/w3c/ecma/test468.scxml
diff --git a/test/samples/w3c/xpath/test469.scxml b/test/w3c/ecma/test469.scxml
index 02fe476..02fe476 100644
--- a/test/samples/w3c/xpath/test469.scxml
+++ b/test/w3c/ecma/test469.scxml
diff --git a/test/samples/w3c/xpath/test470.scxml b/test/w3c/ecma/test470.scxml
index 3c26bb1..3c26bb1 100644
--- a/test/samples/w3c/xpath/test470.scxml
+++ b/test/w3c/ecma/test470.scxml
diff --git a/test/samples/w3c/xpath/test473.scxml b/test/w3c/ecma/test473.scxml
index 4a57129..4a57129 100644
--- a/test/samples/w3c/xpath/test473.scxml
+++ b/test/w3c/ecma/test473.scxml
diff --git a/test/samples/w3c/xpath/test474.scxml b/test/w3c/ecma/test474.scxml
index decad75..decad75 100644
--- a/test/samples/w3c/xpath/test474.scxml
+++ b/test/w3c/ecma/test474.scxml
diff --git a/test/samples/w3c/xpath/test475.scxml b/test/w3c/ecma/test475.scxml
index 0f9cdfe..0f9cdfe 100644
--- a/test/samples/w3c/xpath/test475.scxml
+++ b/test/w3c/ecma/test475.scxml
diff --git a/test/samples/w3c/xpath/test476.scxml b/test/w3c/ecma/test476.scxml
index d3fe8e8..d3fe8e8 100644
--- a/test/samples/w3c/xpath/test476.scxml
+++ b/test/w3c/ecma/test476.scxml
diff --git a/test/samples/w3c/xpath/test477.scxml b/test/w3c/ecma/test477.scxml
index 1726866..1726866 100644
--- a/test/samples/w3c/xpath/test477.scxml
+++ b/test/w3c/ecma/test477.scxml
diff --git a/test/samples/w3c/xpath/test478.scxml b/test/w3c/ecma/test478.scxml
index 9821608..9821608 100644
--- a/test/samples/w3c/xpath/test478.scxml
+++ b/test/w3c/ecma/test478.scxml
diff --git a/test/samples/w3c/xpath/test479.scxml b/test/w3c/ecma/test479.scxml
index 3d5b1ac..3d5b1ac 100644
--- a/test/samples/w3c/xpath/test479.scxml
+++ b/test/w3c/ecma/test479.scxml
diff --git a/test/samples/w3c/xpath/test480.scxml b/test/w3c/ecma/test480.scxml
index 0fde260..0fde260 100644
--- a/test/samples/w3c/xpath/test480.scxml
+++ b/test/w3c/ecma/test480.scxml
diff --git a/test/samples/w3c/xpath/test481.scxml b/test/w3c/ecma/test481.scxml
index a0505f6..a0505f6 100644
--- a/test/samples/w3c/xpath/test481.scxml
+++ b/test/w3c/ecma/test481.scxml
diff --git a/test/samples/w3c/xpath/test482.scxml b/test/w3c/ecma/test482.scxml
index 00eb3fe..00eb3fe 100644
--- a/test/samples/w3c/xpath/test482.scxml
+++ b/test/w3c/ecma/test482.scxml
diff --git a/test/samples/w3c/xpath/test483.scxml b/test/w3c/ecma/test483.scxml
index 0a1b236..0a1b236 100644
--- a/test/samples/w3c/xpath/test483.scxml
+++ b/test/w3c/ecma/test483.scxml
diff --git a/test/samples/w3c/ecma/test487.scxml b/test/w3c/ecma/test487.scxml
index 30a50eb..30a50eb 100644
--- a/test/samples/w3c/ecma/test487.scxml
+++ b/test/w3c/ecma/test487.scxml
diff --git a/test/samples/w3c/ecma/test488.scxml b/test/w3c/ecma/test488.scxml
index 9d9e1d8..9d9e1d8 100644
--- a/test/samples/w3c/ecma/test488.scxml
+++ b/test/w3c/ecma/test488.scxml
diff --git a/test/samples/w3c/ecma/test495.scxml b/test/w3c/ecma/test495.scxml
index e3a8e58..e3a8e58 100644
--- a/test/samples/w3c/ecma/test495.scxml
+++ b/test/w3c/ecma/test495.scxml
diff --git a/test/samples/w3c/ecma/test500.scxml b/test/w3c/ecma/test500.scxml
index 26beec6..26beec6 100644
--- a/test/samples/w3c/ecma/test500.scxml
+++ b/test/w3c/ecma/test500.scxml
diff --git a/test/samples/w3c/ecma/test501.scxml b/test/w3c/ecma/test501.scxml
index 6cca0f5..6cca0f5 100644
--- a/test/samples/w3c/ecma/test501.scxml
+++ b/test/w3c/ecma/test501.scxml
diff --git a/test/samples/w3c/ecma/test503.scxml b/test/w3c/ecma/test503.scxml
index 6e1ab2b..6e1ab2b 100644
--- a/test/samples/w3c/ecma/test503.scxml
+++ b/test/w3c/ecma/test503.scxml
diff --git a/test/samples/w3c/ecma/test504.scxml b/test/w3c/ecma/test504.scxml
index 6e2679b..6e2679b 100644
--- a/test/samples/w3c/ecma/test504.scxml
+++ b/test/w3c/ecma/test504.scxml
diff --git a/test/samples/w3c/ecma/test505.scxml b/test/w3c/ecma/test505.scxml
index 01d326b..01d326b 100644
--- a/test/samples/w3c/ecma/test505.scxml
+++ b/test/w3c/ecma/test505.scxml
diff --git a/test/samples/w3c/ecma/test506.scxml b/test/w3c/ecma/test506.scxml
index 1a7a1da..1a7a1da 100644
--- a/test/samples/w3c/ecma/test506.scxml
+++ b/test/w3c/ecma/test506.scxml
diff --git a/test/samples/w3c/ecma/test509.scxml b/test/w3c/ecma/test509.scxml
index de55b5d..de55b5d 100644
--- a/test/samples/w3c/ecma/test509.scxml
+++ b/test/w3c/ecma/test509.scxml
diff --git a/test/samples/w3c/ecma/test510.scxml b/test/w3c/ecma/test510.scxml
index 45d3057..45d3057 100644
--- a/test/samples/w3c/ecma/test510.scxml
+++ b/test/w3c/ecma/test510.scxml
diff --git a/test/samples/w3c/ecma/test513.scxml b/test/w3c/ecma/test513.scxml
index c26d498..c26d498 100644
--- a/test/samples/w3c/ecma/test513.scxml
+++ b/test/w3c/ecma/test513.scxml
diff --git a/test/samples/w3c/ecma/test518.scxml b/test/w3c/ecma/test518.scxml
index 69f171c..69f171c 100644
--- a/test/samples/w3c/ecma/test518.scxml
+++ b/test/w3c/ecma/test518.scxml
diff --git a/test/samples/w3c/ecma/test519.scxml b/test/w3c/ecma/test519.scxml
index 6f559da..6f559da 100644
--- a/test/samples/w3c/ecma/test519.scxml
+++ b/test/w3c/ecma/test519.scxml
diff --git a/test/samples/w3c/ecma/test520.scxml b/test/w3c/ecma/test520.scxml
index daaf3a8..daaf3a8 100644
--- a/test/samples/w3c/ecma/test520.scxml
+++ b/test/w3c/ecma/test520.scxml
diff --git a/test/samples/w3c/ecma/test521.scxml b/test/w3c/ecma/test521.scxml
index e4b00d8..e4b00d8 100644
--- a/test/samples/w3c/ecma/test521.scxml
+++ b/test/w3c/ecma/test521.scxml
diff --git a/test/samples/w3c/ecma/test522.scxml b/test/w3c/ecma/test522.scxml
index 3f16dac..3f16dac 100644
--- a/test/samples/w3c/ecma/test522.scxml
+++ b/test/w3c/ecma/test522.scxml
diff --git a/test/samples/w3c/ecma/test525.scxml b/test/w3c/ecma/test525.scxml
index 432e760..432e760 100644
--- a/test/samples/w3c/ecma/test525.scxml
+++ b/test/w3c/ecma/test525.scxml
diff --git a/test/samples/w3c/ecma/test527.scxml b/test/w3c/ecma/test527.scxml
index 426cc6c..426cc6c 100644
--- a/test/samples/w3c/ecma/test527.scxml
+++ b/test/w3c/ecma/test527.scxml
diff --git a/test/samples/w3c/ecma/test528.scxml b/test/w3c/ecma/test528.scxml
index f0e8911..f0e8911 100644
--- a/test/samples/w3c/ecma/test528.scxml
+++ b/test/w3c/ecma/test528.scxml
diff --git a/test/samples/w3c/ecma/test529.scxml b/test/w3c/ecma/test529.scxml
index 91dc002..91dc002 100644
--- a/test/samples/w3c/ecma/test529.scxml
+++ b/test/w3c/ecma/test529.scxml
diff --git a/test/samples/w3c/ecma/test530.scxml b/test/w3c/ecma/test530.scxml
index 9361181..9361181 100644
--- a/test/samples/w3c/ecma/test530.scxml
+++ b/test/w3c/ecma/test530.scxml
diff --git a/test/samples/w3c/ecma/test531.scxml b/test/w3c/ecma/test531.scxml
index 9eaa3f3..9eaa3f3 100644
--- a/test/samples/w3c/ecma/test531.scxml
+++ b/test/w3c/ecma/test531.scxml
diff --git a/test/samples/w3c/ecma/test532.scxml b/test/w3c/ecma/test532.scxml
index 412310c..412310c 100644
--- a/test/samples/w3c/ecma/test532.scxml
+++ b/test/w3c/ecma/test532.scxml
diff --git a/test/samples/w3c/ecma/test533.scxml b/test/w3c/ecma/test533.scxml
index a4550e3..a4550e3 100644
--- a/test/samples/w3c/ecma/test533.scxml
+++ b/test/w3c/ecma/test533.scxml
diff --git a/test/samples/w3c/ecma/test534.scxml b/test/w3c/ecma/test534.scxml
index 9495d9e..9495d9e 100644
--- a/test/samples/w3c/ecma/test534.scxml
+++ b/test/w3c/ecma/test534.scxml
diff --git a/test/samples/w3c/xpath/test537.scxml b/test/w3c/ecma/test537.scxml
index 350d422..350d422 100644
--- a/test/samples/w3c/xpath/test537.scxml
+++ b/test/w3c/ecma/test537.scxml
diff --git a/test/samples/w3c/xpath/test539.scxml b/test/w3c/ecma/test539.scxml
index 450bfd9..450bfd9 100644
--- a/test/samples/w3c/xpath/test539.scxml
+++ b/test/w3c/ecma/test539.scxml
diff --git a/test/samples/w3c/xpath/test539.txt b/test/w3c/ecma/test539.txt
index de1b0a1..de1b0a1 100644
--- a/test/samples/w3c/xpath/test539.txt
+++ b/test/w3c/ecma/test539.txt
diff --git a/test/samples/w3c/xpath/test540.scxml b/test/w3c/ecma/test540.scxml
index 641509f..641509f 100644
--- a/test/samples/w3c/xpath/test540.scxml
+++ b/test/w3c/ecma/test540.scxml
diff --git a/test/samples/w3c/xpath/test540.txt b/test/w3c/ecma/test540.txt
index 2191239..2191239 100644
--- a/test/samples/w3c/xpath/test540.txt
+++ b/test/w3c/ecma/test540.txt
diff --git a/test/samples/w3c/xpath/test542.scxml b/test/w3c/ecma/test542.scxml
index 1101471..1101471 100644
--- a/test/samples/w3c/xpath/test542.scxml
+++ b/test/w3c/ecma/test542.scxml
diff --git a/test/samples/w3c/xpath/test543.scxml b/test/w3c/ecma/test543.scxml
index 2c5c6de..2c5c6de 100644
--- a/test/samples/w3c/xpath/test543.scxml
+++ b/test/w3c/ecma/test543.scxml
diff --git a/test/samples/w3c/xpath/test544.scxml b/test/w3c/ecma/test544.scxml
index fd09502..fd09502 100644
--- a/test/samples/w3c/xpath/test544.scxml
+++ b/test/w3c/ecma/test544.scxml
diff --git a/test/samples/w3c/xpath/test546.scxml b/test/w3c/ecma/test546.scxml
index 728843b..728843b 100644
--- a/test/samples/w3c/xpath/test546.scxml
+++ b/test/w3c/ecma/test546.scxml
diff --git a/test/samples/w3c/xpath/test547.scxml b/test/w3c/ecma/test547.scxml
index 8c04c95..8c04c95 100644
--- a/test/samples/w3c/xpath/test547.scxml
+++ b/test/w3c/ecma/test547.scxml
diff --git a/test/samples/w3c/ecma/test550.scxml b/test/w3c/ecma/test550.scxml
index 0ca4c1a..0ca4c1a 100644
--- a/test/samples/w3c/ecma/test550.scxml
+++ b/test/w3c/ecma/test550.scxml
diff --git a/test/samples/w3c/ecma/test551.scxml b/test/w3c/ecma/test551.scxml
index cd267eb..cd267eb 100644
--- a/test/samples/w3c/ecma/test551.scxml
+++ b/test/w3c/ecma/test551.scxml
diff --git a/test/samples/w3c/ecma/test552.scxml b/test/w3c/ecma/test552.scxml
index 94267c6..94267c6 100644
--- a/test/samples/w3c/ecma/test552.scxml
+++ b/test/w3c/ecma/test552.scxml
diff --git a/test/samples/w3c/xpath/test552.txt b/test/w3c/ecma/test552.txt
index d8263ee..d8263ee 100644
--- a/test/samples/w3c/xpath/test552.txt
+++ b/test/w3c/ecma/test552.txt
diff --git a/test/samples/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml
index 114c4a2..114c4a2 100644
--- a/test/samples/w3c/ecma/test553.scxml
+++ b/test/w3c/ecma/test553.scxml
diff --git a/test/samples/w3c/ecma/test554.scxml b/test/w3c/ecma/test554.scxml
index b328ae9..b328ae9 100644
--- a/test/samples/w3c/ecma/test554.scxml
+++ b/test/w3c/ecma/test554.scxml
diff --git a/test/samples/w3c/xpath/test555.scxml b/test/w3c/ecma/test555.scxml
index 79dea75..79dea75 100644
--- a/test/samples/w3c/xpath/test555.scxml
+++ b/test/w3c/ecma/test555.scxml
diff --git a/test/samples/w3c/xpath/test557.scxml b/test/w3c/ecma/test557.scxml
index 6f4eed1..6f4eed1 100644
--- a/test/samples/w3c/xpath/test557.scxml
+++ b/test/w3c/ecma/test557.scxml
diff --git a/test/samples/w3c/xpath/test557.txt b/test/w3c/ecma/test557.txt
index a8e51da..a8e51da 100644
--- a/test/samples/w3c/xpath/test557.txt
+++ b/test/w3c/ecma/test557.txt
diff --git a/test/samples/w3c/xpath/test558.scxml b/test/w3c/ecma/test558.scxml
index a075100..a075100 100644
--- a/test/samples/w3c/xpath/test558.scxml
+++ b/test/w3c/ecma/test558.scxml
diff --git a/test/samples/w3c/xpath/test558.txt b/test/w3c/ecma/test558.txt
index bb2bcc7..bb2bcc7 100644
--- a/test/samples/w3c/xpath/test558.txt
+++ b/test/w3c/ecma/test558.txt
diff --git a/test/samples/w3c/xpath/test560.scxml b/test/w3c/ecma/test560.scxml
index d283b1a..d283b1a 100644
--- a/test/samples/w3c/xpath/test560.scxml
+++ b/test/w3c/ecma/test560.scxml
diff --git a/test/samples/w3c/xpath/test561.scxml b/test/w3c/ecma/test561.scxml
index e50e00c..e50e00c 100644
--- a/test/samples/w3c/xpath/test561.scxml
+++ b/test/w3c/ecma/test561.scxml
diff --git a/test/samples/w3c/xpath/test562.scxml b/test/w3c/ecma/test562.scxml
index f5997bb..f5997bb 100644
--- a/test/samples/w3c/xpath/test562.scxml
+++ b/test/w3c/ecma/test562.scxml
diff --git a/test/samples/w3c/ecma/test567.scxml b/test/w3c/ecma/test567.scxml
index 465105b..465105b 100644
--- a/test/samples/w3c/ecma/test567.scxml
+++ b/test/w3c/ecma/test567.scxml
diff --git a/test/samples/w3c/xpath/test568.scxml b/test/w3c/ecma/test568.scxml
index e8b888f..e8b888f 100644
--- a/test/samples/w3c/xpath/test568.scxml
+++ b/test/w3c/ecma/test568.scxml
diff --git a/test/samples/w3c/xpath/test569.scxml b/test/w3c/ecma/test569.scxml
index 832a0c0..832a0c0 100644
--- a/test/samples/w3c/xpath/test569.scxml
+++ b/test/w3c/ecma/test569.scxml
diff --git a/test/samples/w3c/ecma/test570.scxml b/test/w3c/ecma/test570.scxml
index 2f5ccbe..2f5ccbe 100644
--- a/test/samples/w3c/ecma/test570.scxml
+++ b/test/w3c/ecma/test570.scxml
diff --git a/test/samples/w3c/ecma/test576.scxml b/test/w3c/ecma/test576.scxml
index 2bed2ca..2bed2ca 100644
--- a/test/samples/w3c/ecma/test576.scxml
+++ b/test/w3c/ecma/test576.scxml
diff --git a/test/samples/w3c/xpath/test578.scxml b/test/w3c/ecma/test578.scxml
index bdb5e2d..bdb5e2d 100644
--- a/test/samples/w3c/xpath/test578.scxml
+++ b/test/w3c/ecma/test578.scxml
diff --git a/test/samples/w3c/txml/robots.txt b/test/w3c/txml/robots.txt
index 54f3e01..54f3e01 100644
--- a/test/samples/w3c/txml/robots.txt
+++ b/test/w3c/txml/robots.txt
diff --git a/test/samples/w3c/txml/test144.txml b/test/w3c/txml/test144.txml
index 73e50b0..73e50b0 100644
--- a/test/samples/w3c/txml/test144.txml
+++ b/test/w3c/txml/test144.txml
diff --git a/test/samples/w3c/txml/test147.txml b/test/w3c/txml/test147.txml
index 20363a0..20363a0 100644
--- a/test/samples/w3c/txml/test147.txml
+++ b/test/w3c/txml/test147.txml
diff --git a/test/samples/w3c/txml/test148.txml b/test/w3c/txml/test148.txml
index 8d19e56..8d19e56 100644
--- a/test/samples/w3c/txml/test148.txml
+++ b/test/w3c/txml/test148.txml
diff --git a/test/samples/w3c/txml/test149.txml b/test/w3c/txml/test149.txml
index c971eea..c971eea 100644
--- a/test/samples/w3c/txml/test149.txml
+++ b/test/w3c/txml/test149.txml
diff --git a/test/samples/w3c/txml/test150.txml b/test/w3c/txml/test150.txml
index ff290dd..ff290dd 100644
--- a/test/samples/w3c/txml/test150.txml
+++ b/test/w3c/txml/test150.txml
diff --git a/test/samples/w3c/txml/test151.txml b/test/w3c/txml/test151.txml
index 6f95692..6f95692 100644
--- a/test/samples/w3c/txml/test151.txml
+++ b/test/w3c/txml/test151.txml
diff --git a/test/samples/w3c/txml/test152.txml b/test/w3c/txml/test152.txml
index 86b50e9..86b50e9 100644
--- a/test/samples/w3c/txml/test152.txml
+++ b/test/w3c/txml/test152.txml
diff --git a/test/samples/w3c/txml/test153.txml b/test/w3c/txml/test153.txml
index e9f8038..e9f8038 100644
--- a/test/samples/w3c/txml/test153.txml
+++ b/test/w3c/txml/test153.txml
diff --git a/test/samples/w3c/txml/test155.txml b/test/w3c/txml/test155.txml
index 8444442..8444442 100644
--- a/test/samples/w3c/txml/test155.txml
+++ b/test/w3c/txml/test155.txml
diff --git a/test/samples/w3c/txml/test156.txml b/test/w3c/txml/test156.txml
index 316f879..316f879 100644
--- a/test/samples/w3c/txml/test156.txml
+++ b/test/w3c/txml/test156.txml
diff --git a/test/samples/w3c/txml/test158.txml b/test/w3c/txml/test158.txml
index cff220d..cff220d 100644
--- a/test/samples/w3c/txml/test158.txml
+++ b/test/w3c/txml/test158.txml
diff --git a/test/samples/w3c/txml/test159.txml b/test/w3c/txml/test159.txml
index b7245c0..b7245c0 100644
--- a/test/samples/w3c/txml/test159.txml
+++ b/test/w3c/txml/test159.txml
diff --git a/test/samples/w3c/txml/test172.txml b/test/w3c/txml/test172.txml
index 45075a0..45075a0 100644
--- a/test/samples/w3c/txml/test172.txml
+++ b/test/w3c/txml/test172.txml
diff --git a/test/samples/w3c/txml/test173.txml b/test/w3c/txml/test173.txml
index c770856..c770856 100644
--- a/test/samples/w3c/txml/test173.txml
+++ b/test/w3c/txml/test173.txml
diff --git a/test/samples/w3c/txml/test174.txml b/test/w3c/txml/test174.txml
index 3d33d5b..3d33d5b 100644
--- a/test/samples/w3c/txml/test174.txml
+++ b/test/w3c/txml/test174.txml
diff --git a/test/samples/w3c/txml/test175.txml b/test/w3c/txml/test175.txml
index aba7ac4..aba7ac4 100644
--- a/test/samples/w3c/txml/test175.txml
+++ b/test/w3c/txml/test175.txml
diff --git a/test/samples/w3c/txml/test176.txml b/test/w3c/txml/test176.txml
index 8d084d4..8d084d4 100644
--- a/test/samples/w3c/txml/test176.txml
+++ b/test/w3c/txml/test176.txml
diff --git a/test/samples/w3c/txml/test178.txml b/test/w3c/txml/test178.txml
index de7a334..de7a334 100644
--- a/test/samples/w3c/txml/test178.txml
+++ b/test/w3c/txml/test178.txml
diff --git a/test/samples/w3c/txml/test179.txml b/test/w3c/txml/test179.txml
index 02b74f6..02b74f6 100644
--- a/test/samples/w3c/txml/test179.txml
+++ b/test/w3c/txml/test179.txml
diff --git a/test/samples/w3c/txml/test183.txml b/test/w3c/txml/test183.txml
index bb6e44a..bb6e44a 100644
--- a/test/samples/w3c/txml/test183.txml
+++ b/test/w3c/txml/test183.txml
diff --git a/test/samples/w3c/txml/test185.txml b/test/w3c/txml/test185.txml
index c036cbf..c036cbf 100644
--- a/test/samples/w3c/txml/test185.txml
+++ b/test/w3c/txml/test185.txml
diff --git a/test/samples/w3c/txml/test186.txml b/test/w3c/txml/test186.txml
index e91c290..e91c290 100644
--- a/test/samples/w3c/txml/test186.txml
+++ b/test/w3c/txml/test186.txml
diff --git a/test/samples/w3c/txml/test187.txml b/test/w3c/txml/test187.txml
index 994a489..994a489 100644
--- a/test/samples/w3c/txml/test187.txml
+++ b/test/w3c/txml/test187.txml
diff --git a/test/samples/w3c/txml/test189.txml b/test/w3c/txml/test189.txml
index cd1cd19..cd1cd19 100644
--- a/test/samples/w3c/txml/test189.txml
+++ b/test/w3c/txml/test189.txml
diff --git a/test/samples/w3c/txml/test190.txml b/test/w3c/txml/test190.txml
index e6090eb..e6090eb 100644
--- a/test/samples/w3c/txml/test190.txml
+++ b/test/w3c/txml/test190.txml
diff --git a/test/samples/w3c/txml/test191.txml b/test/w3c/txml/test191.txml
index 6f42159..6f42159 100644
--- a/test/samples/w3c/txml/test191.txml
+++ b/test/w3c/txml/test191.txml
diff --git a/test/samples/w3c/txml/test192.txml b/test/w3c/txml/test192.txml
index 7331750..7331750 100644
--- a/test/samples/w3c/txml/test192.txml
+++ b/test/w3c/txml/test192.txml
diff --git a/test/samples/w3c/txml/test193.txml b/test/w3c/txml/test193.txml
index ba1598b..ba1598b 100644
--- a/test/samples/w3c/txml/test193.txml
+++ b/test/w3c/txml/test193.txml
diff --git a/test/samples/w3c/txml/test194.txml b/test/w3c/txml/test194.txml
index 9e660a5..9e660a5 100644
--- a/test/samples/w3c/txml/test194.txml
+++ b/test/w3c/txml/test194.txml
diff --git a/test/samples/w3c/txml/test198.txml b/test/w3c/txml/test198.txml
index 706ea93..706ea93 100644
--- a/test/samples/w3c/txml/test198.txml
+++ b/test/w3c/txml/test198.txml
diff --git a/test/samples/w3c/txml/test199.txml b/test/w3c/txml/test199.txml
index dadd5b0..dadd5b0 100644
--- a/test/samples/w3c/txml/test199.txml
+++ b/test/w3c/txml/test199.txml
diff --git a/test/samples/w3c/txml/test200.txml b/test/w3c/txml/test200.txml
index 4aed203..4aed203 100644
--- a/test/samples/w3c/txml/test200.txml
+++ b/test/w3c/txml/test200.txml
diff --git a/test/samples/w3c/txml/test201.txml b/test/w3c/txml/test201.txml
index cdcf285..cdcf285 100644
--- a/test/samples/w3c/txml/test201.txml
+++ b/test/w3c/txml/test201.txml
diff --git a/test/samples/w3c/txml/test205.txml b/test/w3c/txml/test205.txml
index 6cc06f4..6cc06f4 100644
--- a/test/samples/w3c/txml/test205.txml
+++ b/test/w3c/txml/test205.txml
diff --git a/test/samples/w3c/txml/test207.txml b/test/w3c/txml/test207.txml
index 6893dcf..6893dcf 100644
--- a/test/samples/w3c/txml/test207.txml
+++ b/test/w3c/txml/test207.txml
diff --git a/test/samples/w3c/txml/test208.txml b/test/w3c/txml/test208.txml
index 5a86e6d..5a86e6d 100644
--- a/test/samples/w3c/txml/test208.txml
+++ b/test/w3c/txml/test208.txml
diff --git a/test/samples/w3c/txml/test210.txml b/test/w3c/txml/test210.txml
index 402ed36..402ed36 100644
--- a/test/samples/w3c/txml/test210.txml
+++ b/test/w3c/txml/test210.txml
diff --git a/test/samples/w3c/txml/test215.txml b/test/w3c/txml/test215.txml
index afb8df5..afb8df5 100644
--- a/test/samples/w3c/txml/test215.txml
+++ b/test/w3c/txml/test215.txml
diff --git a/test/samples/w3c/txml/test216.txml b/test/w3c/txml/test216.txml
index e65818e..e65818e 100644
--- a/test/samples/w3c/txml/test216.txml
+++ b/test/w3c/txml/test216.txml
diff --git a/test/samples/w3c/txml/test216sub1.txml b/test/w3c/txml/test216sub1.txml
index eb4c9df..eb4c9df 100644
--- a/test/samples/w3c/txml/test216sub1.txml
+++ b/test/w3c/txml/test216sub1.txml
diff --git a/test/samples/w3c/txml/test220.txml b/test/w3c/txml/test220.txml
index 4c79e4d..4c79e4d 100644
--- a/test/samples/w3c/txml/test220.txml
+++ b/test/w3c/txml/test220.txml
diff --git a/test/samples/w3c/txml/test223.txml b/test/w3c/txml/test223.txml
index 9cdc499..9cdc499 100644
--- a/test/samples/w3c/txml/test223.txml
+++ b/test/w3c/txml/test223.txml
diff --git a/test/samples/w3c/txml/test224.txml b/test/w3c/txml/test224.txml
index 0ffe8eb..0ffe8eb 100644
--- a/test/samples/w3c/txml/test224.txml
+++ b/test/w3c/txml/test224.txml
diff --git a/test/samples/w3c/txml/test225.txml b/test/w3c/txml/test225.txml
index 548ff46..548ff46 100644
--- a/test/samples/w3c/txml/test225.txml
+++ b/test/w3c/txml/test225.txml
diff --git a/test/samples/w3c/txml/test226.txml b/test/w3c/txml/test226.txml
index 0d83070..0d83070 100644
--- a/test/samples/w3c/txml/test226.txml
+++ b/test/w3c/txml/test226.txml
diff --git a/test/samples/w3c/txml/test226sub1.txml b/test/w3c/txml/test226sub1.txml
index b4780c7..b4780c7 100644
--- a/test/samples/w3c/txml/test226sub1.txml
+++ b/test/w3c/txml/test226sub1.txml
diff --git a/test/samples/w3c/txml/test228.txml b/test/w3c/txml/test228.txml
index 40021bb..40021bb 100644
--- a/test/samples/w3c/txml/test228.txml
+++ b/test/w3c/txml/test228.txml
diff --git a/test/samples/w3c/txml/test229.txml b/test/w3c/txml/test229.txml
index 3837b69..3837b69 100644
--- a/test/samples/w3c/txml/test229.txml
+++ b/test/w3c/txml/test229.txml
diff --git a/test/samples/w3c/txml/test230.txml b/test/w3c/txml/test230.txml
index fc27220..fc27220 100644
--- a/test/samples/w3c/txml/test230.txml
+++ b/test/w3c/txml/test230.txml
diff --git a/test/samples/w3c/txml/test232.txml b/test/w3c/txml/test232.txml
index 1cbc14f..1cbc14f 100644
--- a/test/samples/w3c/txml/test232.txml
+++ b/test/w3c/txml/test232.txml
diff --git a/test/samples/w3c/txml/test233.txml b/test/w3c/txml/test233.txml
index 94b219b..94b219b 100644
--- a/test/samples/w3c/txml/test233.txml
+++ b/test/w3c/txml/test233.txml
diff --git a/test/samples/w3c/txml/test234.txml b/test/w3c/txml/test234.txml
index 27d4626..27d4626 100644
--- a/test/samples/w3c/txml/test234.txml
+++ b/test/w3c/txml/test234.txml
diff --git a/test/samples/w3c/txml/test235.txml b/test/w3c/txml/test235.txml
index 84b8680..84b8680 100644
--- a/test/samples/w3c/txml/test235.txml
+++ b/test/w3c/txml/test235.txml
diff --git a/test/samples/w3c/txml/test236.txml b/test/w3c/txml/test236.txml
index 5d18c2f..5d18c2f 100644
--- a/test/samples/w3c/txml/test236.txml
+++ b/test/w3c/txml/test236.txml
diff --git a/test/samples/w3c/txml/test237.txml b/test/w3c/txml/test237.txml
index c6097bc..c6097bc 100644
--- a/test/samples/w3c/txml/test237.txml
+++ b/test/w3c/txml/test237.txml
diff --git a/test/samples/w3c/txml/test239.txml b/test/w3c/txml/test239.txml
index 8fa1837..8fa1837 100644
--- a/test/samples/w3c/txml/test239.txml
+++ b/test/w3c/txml/test239.txml
diff --git a/test/samples/w3c/txml/test239sub1.txml b/test/w3c/txml/test239sub1.txml
index fd27e45..fd27e45 100644
--- a/test/samples/w3c/txml/test239sub1.txml
+++ b/test/w3c/txml/test239sub1.txml
diff --git a/test/samples/w3c/txml/test240.txml b/test/w3c/txml/test240.txml
index bf669d4..bf669d4 100644
--- a/test/samples/w3c/txml/test240.txml
+++ b/test/w3c/txml/test240.txml
diff --git a/test/samples/w3c/txml/test241.txml b/test/w3c/txml/test241.txml
index 9587697..9587697 100644
--- a/test/samples/w3c/txml/test241.txml
+++ b/test/w3c/txml/test241.txml
diff --git a/test/samples/w3c/txml/test242.txml b/test/w3c/txml/test242.txml
index 35fa154..35fa154 100644
--- a/test/samples/w3c/txml/test242.txml
+++ b/test/w3c/txml/test242.txml
diff --git a/test/samples/w3c/txml/test242sub1.txml b/test/w3c/txml/test242sub1.txml
index fd27e45..fd27e45 100644
--- a/test/samples/w3c/txml/test242sub1.txml
+++ b/test/w3c/txml/test242sub1.txml
diff --git a/test/samples/w3c/txml/test243.txml b/test/w3c/txml/test243.txml
index a01345c..a01345c 100644
--- a/test/samples/w3c/txml/test243.txml
+++ b/test/w3c/txml/test243.txml
diff --git a/test/samples/w3c/txml/test244.txml b/test/w3c/txml/test244.txml
index c0f1a23..c0f1a23 100644
--- a/test/samples/w3c/txml/test244.txml
+++ b/test/w3c/txml/test244.txml
diff --git a/test/samples/w3c/txml/test245.txml b/test/w3c/txml/test245.txml
index 459bec6..459bec6 100644
--- a/test/samples/w3c/txml/test245.txml
+++ b/test/w3c/txml/test245.txml
diff --git a/test/samples/w3c/txml/test247.txml b/test/w3c/txml/test247.txml
index 7c528a3..7c528a3 100644
--- a/test/samples/w3c/txml/test247.txml
+++ b/test/w3c/txml/test247.txml
diff --git a/test/samples/w3c/txml/test250.txml b/test/w3c/txml/test250.txml
index 3455062..3455062 100644
--- a/test/samples/w3c/txml/test250.txml
+++ b/test/w3c/txml/test250.txml
diff --git a/test/samples/w3c/txml/test252.txml b/test/w3c/txml/test252.txml
index 40c36cb..40c36cb 100644
--- a/test/samples/w3c/txml/test252.txml
+++ b/test/w3c/txml/test252.txml
diff --git a/test/samples/w3c/txml/test253.txml b/test/w3c/txml/test253.txml
index 041797a..041797a 100644
--- a/test/samples/w3c/txml/test253.txml
+++ b/test/w3c/txml/test253.txml
diff --git a/test/samples/w3c/txml/test276.txml b/test/w3c/txml/test276.txml
index e4a9d9f..e4a9d9f 100644
--- a/test/samples/w3c/txml/test276.txml
+++ b/test/w3c/txml/test276.txml
diff --git a/test/samples/w3c/txml/test276sub1.txml b/test/w3c/txml/test276sub1.txml
index 3bb40c0..3bb40c0 100644
--- a/test/samples/w3c/txml/test276sub1.txml
+++ b/test/w3c/txml/test276sub1.txml
diff --git a/test/samples/w3c/txml/test277.txml b/test/w3c/txml/test277.txml
index bd08341..bd08341 100644
--- a/test/samples/w3c/txml/test277.txml
+++ b/test/w3c/txml/test277.txml
diff --git a/test/samples/w3c/txml/test278.txml b/test/w3c/txml/test278.txml
index c95b329..c95b329 100644
--- a/test/samples/w3c/txml/test278.txml
+++ b/test/w3c/txml/test278.txml
diff --git a/test/samples/w3c/txml/test279.txml b/test/w3c/txml/test279.txml
index b3b1adc..b3b1adc 100644
--- a/test/samples/w3c/txml/test279.txml
+++ b/test/w3c/txml/test279.txml
diff --git a/test/samples/w3c/txml/test280.txml b/test/w3c/txml/test280.txml
index 723eaa5..723eaa5 100644
--- a/test/samples/w3c/txml/test280.txml
+++ b/test/w3c/txml/test280.txml
diff --git a/test/samples/w3c/txml/test286.txml b/test/w3c/txml/test286.txml
index 89b77a9..89b77a9 100644
--- a/test/samples/w3c/txml/test286.txml
+++ b/test/w3c/txml/test286.txml
diff --git a/test/samples/w3c/txml/test287.txml b/test/w3c/txml/test287.txml
index 8f25165..8f25165 100644
--- a/test/samples/w3c/txml/test287.txml
+++ b/test/w3c/txml/test287.txml
diff --git a/test/samples/w3c/txml/test294.txml b/test/w3c/txml/test294.txml
index 507ff3b..507ff3b 100644
--- a/test/samples/w3c/txml/test294.txml
+++ b/test/w3c/txml/test294.txml
diff --git a/test/samples/w3c/txml/test298.txml b/test/w3c/txml/test298.txml
index e1af350..e1af350 100644
--- a/test/samples/w3c/txml/test298.txml
+++ b/test/w3c/txml/test298.txml
diff --git a/test/samples/w3c/txml/test301.txml b/test/w3c/txml/test301.txml
index d3245f3..d3245f3 100644
--- a/test/samples/w3c/txml/test301.txml
+++ b/test/w3c/txml/test301.txml
diff --git a/test/samples/w3c/txml/test302.txml b/test/w3c/txml/test302.txml
index b5ecbae..b5ecbae 100644
--- a/test/samples/w3c/txml/test302.txml
+++ b/test/w3c/txml/test302.txml
diff --git a/test/samples/w3c/txml/test303.txml b/test/w3c/txml/test303.txml
index b7fe556..b7fe556 100644
--- a/test/samples/w3c/txml/test303.txml
+++ b/test/w3c/txml/test303.txml
diff --git a/test/samples/w3c/txml/test304.txml b/test/w3c/txml/test304.txml
index a165ff8..a165ff8 100644
--- a/test/samples/w3c/txml/test304.txml
+++ b/test/w3c/txml/test304.txml
diff --git a/test/samples/w3c/txml/test307.txml b/test/w3c/txml/test307.txml
index 4065f5f..4065f5f 100644
--- a/test/samples/w3c/txml/test307.txml
+++ b/test/w3c/txml/test307.txml
diff --git a/test/samples/w3c/txml/test309.txml b/test/w3c/txml/test309.txml
index c781100..c781100 100644
--- a/test/samples/w3c/txml/test309.txml
+++ b/test/w3c/txml/test309.txml
diff --git a/test/samples/w3c/txml/test310.txml b/test/w3c/txml/test310.txml
index f88a87a..f88a87a 100644
--- a/test/samples/w3c/txml/test310.txml
+++ b/test/w3c/txml/test310.txml
diff --git a/test/samples/w3c/txml/test311.txml b/test/w3c/txml/test311.txml
index f6485be..f6485be 100644
--- a/test/samples/w3c/txml/test311.txml
+++ b/test/w3c/txml/test311.txml
diff --git a/test/samples/w3c/txml/test312.txml b/test/w3c/txml/test312.txml
index 597200b..597200b 100644
--- a/test/samples/w3c/txml/test312.txml
+++ b/test/w3c/txml/test312.txml
diff --git a/test/samples/w3c/txml/test313.txml b/test/w3c/txml/test313.txml
index ee11064..ee11064 100644
--- a/test/samples/w3c/txml/test313.txml
+++ b/test/w3c/txml/test313.txml
diff --git a/test/samples/w3c/txml/test314.txml b/test/w3c/txml/test314.txml
index 7a2329e..7a2329e 100644
--- a/test/samples/w3c/txml/test314.txml
+++ b/test/w3c/txml/test314.txml
diff --git a/test/samples/w3c/txml/test318.txml b/test/w3c/txml/test318.txml
index 9e71bc6..9e71bc6 100644
--- a/test/samples/w3c/txml/test318.txml
+++ b/test/w3c/txml/test318.txml
diff --git a/test/samples/w3c/txml/test319.txml b/test/w3c/txml/test319.txml
index 50e4a97..50e4a97 100644
--- a/test/samples/w3c/txml/test319.txml
+++ b/test/w3c/txml/test319.txml
diff --git a/test/samples/w3c/txml/test321.txml b/test/w3c/txml/test321.txml
index 9cd6b02..9cd6b02 100644
--- a/test/samples/w3c/txml/test321.txml
+++ b/test/w3c/txml/test321.txml
diff --git a/test/samples/w3c/txml/test322.txml b/test/w3c/txml/test322.txml
index 6900eef..6900eef 100644
--- a/test/samples/w3c/txml/test322.txml
+++ b/test/w3c/txml/test322.txml
diff --git a/test/samples/w3c/txml/test323.txml b/test/w3c/txml/test323.txml
index a16333c..a16333c 100644
--- a/test/samples/w3c/txml/test323.txml
+++ b/test/w3c/txml/test323.txml
diff --git a/test/samples/w3c/txml/test324.txml b/test/w3c/txml/test324.txml
index d1b304d..d1b304d 100644
--- a/test/samples/w3c/txml/test324.txml
+++ b/test/w3c/txml/test324.txml
diff --git a/test/samples/w3c/txml/test325.txml b/test/w3c/txml/test325.txml
index 53623c3..53623c3 100644
--- a/test/samples/w3c/txml/test325.txml
+++ b/test/w3c/txml/test325.txml
diff --git a/test/samples/w3c/txml/test326.txml b/test/w3c/txml/test326.txml
index 008e786..008e786 100644
--- a/test/samples/w3c/txml/test326.txml
+++ b/test/w3c/txml/test326.txml
diff --git a/test/samples/w3c/txml/test329.txml b/test/w3c/txml/test329.txml
index 2552e1f..2552e1f 100644
--- a/test/samples/w3c/txml/test329.txml
+++ b/test/w3c/txml/test329.txml
diff --git a/test/samples/w3c/txml/test330.txml b/test/w3c/txml/test330.txml
index 7778fad..7778fad 100644
--- a/test/samples/w3c/txml/test330.txml
+++ b/test/w3c/txml/test330.txml
diff --git a/test/samples/w3c/txml/test331.txml b/test/w3c/txml/test331.txml
index a273b14..a273b14 100644
--- a/test/samples/w3c/txml/test331.txml
+++ b/test/w3c/txml/test331.txml
diff --git a/test/samples/w3c/txml/test332.txml b/test/w3c/txml/test332.txml
index 0f87545..0f87545 100644
--- a/test/samples/w3c/txml/test332.txml
+++ b/test/w3c/txml/test332.txml
diff --git a/test/samples/w3c/txml/test333.txml b/test/w3c/txml/test333.txml
index 38a5097..38a5097 100644
--- a/test/samples/w3c/txml/test333.txml
+++ b/test/w3c/txml/test333.txml
diff --git a/test/samples/w3c/txml/test335.txml b/test/w3c/txml/test335.txml
index e9c70b2..e9c70b2 100644
--- a/test/samples/w3c/txml/test335.txml
+++ b/test/w3c/txml/test335.txml
diff --git a/test/samples/w3c/txml/test336.txml b/test/w3c/txml/test336.txml
index 889cb94..889cb94 100644
--- a/test/samples/w3c/txml/test336.txml
+++ b/test/w3c/txml/test336.txml
diff --git a/test/samples/w3c/txml/test337.txml b/test/w3c/txml/test337.txml
index 4d5e44f..4d5e44f 100644
--- a/test/samples/w3c/txml/test337.txml
+++ b/test/w3c/txml/test337.txml
diff --git a/test/samples/w3c/txml/test338.txml b/test/w3c/txml/test338.txml
index 5f81086..5f81086 100644
--- a/test/samples/w3c/txml/test338.txml
+++ b/test/w3c/txml/test338.txml
diff --git a/test/samples/w3c/txml/test339.txml b/test/w3c/txml/test339.txml
index 7ea1081..7ea1081 100644
--- a/test/samples/w3c/txml/test339.txml
+++ b/test/w3c/txml/test339.txml
diff --git a/test/samples/w3c/txml/test342.txml b/test/w3c/txml/test342.txml
index d8f330a..d8f330a 100644
--- a/test/samples/w3c/txml/test342.txml
+++ b/test/w3c/txml/test342.txml
diff --git a/test/samples/w3c/txml/test343.txml b/test/w3c/txml/test343.txml
index 1d13da6..1d13da6 100644
--- a/test/samples/w3c/txml/test343.txml
+++ b/test/w3c/txml/test343.txml
diff --git a/test/samples/w3c/txml/test344.txml b/test/w3c/txml/test344.txml
index 7723f78..7723f78 100644
--- a/test/samples/w3c/txml/test344.txml
+++ b/test/w3c/txml/test344.txml
diff --git a/test/samples/w3c/txml/test346.txml b/test/w3c/txml/test346.txml
index 10db614..10db614 100644
--- a/test/samples/w3c/txml/test346.txml
+++ b/test/w3c/txml/test346.txml
diff --git a/test/samples/w3c/txml/test347.txml b/test/w3c/txml/test347.txml
index 4a87324..4a87324 100644
--- a/test/samples/w3c/txml/test347.txml
+++ b/test/w3c/txml/test347.txml
diff --git a/test/samples/w3c/txml/test348.txml b/test/w3c/txml/test348.txml
index c633a74..c633a74 100644
--- a/test/samples/w3c/txml/test348.txml
+++ b/test/w3c/txml/test348.txml
diff --git a/test/samples/w3c/txml/test349.txml b/test/w3c/txml/test349.txml
index 6b1fff1..6b1fff1 100644
--- a/test/samples/w3c/txml/test349.txml
+++ b/test/w3c/txml/test349.txml
diff --git a/test/samples/w3c/txml/test350.txml b/test/w3c/txml/test350.txml
index b57e881..b57e881 100644
--- a/test/samples/w3c/txml/test350.txml
+++ b/test/w3c/txml/test350.txml
diff --git a/test/samples/w3c/txml/test351.txml b/test/w3c/txml/test351.txml
index de3bfcc..de3bfcc 100644
--- a/test/samples/w3c/txml/test351.txml
+++ b/test/w3c/txml/test351.txml
diff --git a/test/samples/w3c/txml/test352.txml b/test/w3c/txml/test352.txml
index 448a21e..448a21e 100644
--- a/test/samples/w3c/txml/test352.txml
+++ b/test/w3c/txml/test352.txml
diff --git a/test/samples/w3c/txml/test354.txml b/test/w3c/txml/test354.txml
index d9e643a..d9e643a 100644
--- a/test/samples/w3c/txml/test354.txml
+++ b/test/w3c/txml/test354.txml
diff --git a/test/samples/w3c/txml/test355.txml b/test/w3c/txml/test355.txml
index 4136801..4136801 100644
--- a/test/samples/w3c/txml/test355.txml
+++ b/test/w3c/txml/test355.txml
diff --git a/test/samples/w3c/txml/test364.txml b/test/w3c/txml/test364.txml
index a302f54..a302f54 100644
--- a/test/samples/w3c/txml/test364.txml
+++ b/test/w3c/txml/test364.txml
diff --git a/test/samples/w3c/txml/test372.txml b/test/w3c/txml/test372.txml
index 84cb8f6..84cb8f6 100644
--- a/test/samples/w3c/txml/test372.txml
+++ b/test/w3c/txml/test372.txml
diff --git a/test/samples/w3c/txml/test375.txml b/test/w3c/txml/test375.txml
index 47d42c5..47d42c5 100644
--- a/test/samples/w3c/txml/test375.txml
+++ b/test/w3c/txml/test375.txml
diff --git a/test/samples/w3c/txml/test376.txml b/test/w3c/txml/test376.txml
index 86c2c2c..86c2c2c 100644
--- a/test/samples/w3c/txml/test376.txml
+++ b/test/w3c/txml/test376.txml
diff --git a/test/samples/w3c/txml/test377.txml b/test/w3c/txml/test377.txml
index bca44ca..bca44ca 100644
--- a/test/samples/w3c/txml/test377.txml
+++ b/test/w3c/txml/test377.txml
diff --git a/test/samples/w3c/txml/test378.txml b/test/w3c/txml/test378.txml
index 0e553c4..0e553c4 100644
--- a/test/samples/w3c/txml/test378.txml
+++ b/test/w3c/txml/test378.txml
diff --git a/test/samples/w3c/txml/test387.txml b/test/w3c/txml/test387.txml
index 8997580..8997580 100644
--- a/test/samples/w3c/txml/test387.txml
+++ b/test/w3c/txml/test387.txml
diff --git a/test/samples/w3c/txml/test388.txml b/test/w3c/txml/test388.txml
index 36d58cc..36d58cc 100644
--- a/test/samples/w3c/txml/test388.txml
+++ b/test/w3c/txml/test388.txml
diff --git a/test/samples/w3c/txml/test396.txml b/test/w3c/txml/test396.txml
index 3af03c9..3af03c9 100644
--- a/test/samples/w3c/txml/test396.txml
+++ b/test/w3c/txml/test396.txml
diff --git a/test/samples/w3c/txml/test399.txml b/test/w3c/txml/test399.txml
index 9eeced2..9eeced2 100644
--- a/test/samples/w3c/txml/test399.txml
+++ b/test/w3c/txml/test399.txml
diff --git a/test/samples/w3c/txml/test401.txml b/test/w3c/txml/test401.txml
index a42b719..a42b719 100644
--- a/test/samples/w3c/txml/test401.txml
+++ b/test/w3c/txml/test401.txml
diff --git a/test/samples/w3c/txml/test402.txml b/test/w3c/txml/test402.txml
index 24e84e1..24e84e1 100644
--- a/test/samples/w3c/txml/test402.txml
+++ b/test/w3c/txml/test402.txml
diff --git a/test/samples/w3c/txml/test403a.txml b/test/w3c/txml/test403a.txml
index 88bc4dc..88bc4dc 100644
--- a/test/samples/w3c/txml/test403a.txml
+++ b/test/w3c/txml/test403a.txml
diff --git a/test/samples/w3c/txml/test403b.txml b/test/w3c/txml/test403b.txml
index c3ee1f8..c3ee1f8 100644
--- a/test/samples/w3c/txml/test403b.txml
+++ b/test/w3c/txml/test403b.txml
diff --git a/test/samples/w3c/txml/test403c.txml b/test/w3c/txml/test403c.txml
index 8af1aac..8af1aac 100644
--- a/test/samples/w3c/txml/test403c.txml
+++ b/test/w3c/txml/test403c.txml
diff --git a/test/samples/w3c/txml/test404.txml b/test/w3c/txml/test404.txml
index 6734dbd..6734dbd 100644
--- a/test/samples/w3c/txml/test404.txml
+++ b/test/w3c/txml/test404.txml
diff --git a/test/samples/w3c/txml/test405.txml b/test/w3c/txml/test405.txml
index ca8254e..ca8254e 100644
--- a/test/samples/w3c/txml/test405.txml
+++ b/test/w3c/txml/test405.txml
diff --git a/test/samples/w3c/txml/test406.txml b/test/w3c/txml/test406.txml
index 9504381..9504381 100644
--- a/test/samples/w3c/txml/test406.txml
+++ b/test/w3c/txml/test406.txml
diff --git a/test/samples/w3c/txml/test407.txml b/test/w3c/txml/test407.txml
index fdef966..fdef966 100644
--- a/test/samples/w3c/txml/test407.txml
+++ b/test/w3c/txml/test407.txml
diff --git a/test/samples/w3c/txml/test409.txml b/test/w3c/txml/test409.txml
index abc92ee..abc92ee 100644
--- a/test/samples/w3c/txml/test409.txml
+++ b/test/w3c/txml/test409.txml
diff --git a/test/samples/w3c/txml/test411.txml b/test/w3c/txml/test411.txml
index 149e21e..149e21e 100644
--- a/test/samples/w3c/txml/test411.txml
+++ b/test/w3c/txml/test411.txml
diff --git a/test/samples/w3c/txml/test412.txml b/test/w3c/txml/test412.txml
index 6eb703f..6eb703f 100644
--- a/test/samples/w3c/txml/test412.txml
+++ b/test/w3c/txml/test412.txml
diff --git a/test/samples/w3c/txml/test413.txml b/test/w3c/txml/test413.txml
index 0ac00e3..0ac00e3 100644
--- a/test/samples/w3c/txml/test413.txml
+++ b/test/w3c/txml/test413.txml
diff --git a/test/samples/w3c/txml/test415.txml b/test/w3c/txml/test415.txml
index 5bb3343..5bb3343 100644
--- a/test/samples/w3c/txml/test415.txml
+++ b/test/w3c/txml/test415.txml
diff --git a/test/samples/w3c/txml/test416.txml b/test/w3c/txml/test416.txml
index bb0b6f5..bb0b6f5 100644
--- a/test/samples/w3c/txml/test416.txml
+++ b/test/w3c/txml/test416.txml
diff --git a/test/samples/w3c/txml/test417.txml b/test/w3c/txml/test417.txml
index 5963d68..5963d68 100644
--- a/test/samples/w3c/txml/test417.txml
+++ b/test/w3c/txml/test417.txml
diff --git a/test/samples/w3c/txml/test419.txml b/test/w3c/txml/test419.txml
index 2d8fab7..2d8fab7 100644
--- a/test/samples/w3c/txml/test419.txml
+++ b/test/w3c/txml/test419.txml
diff --git a/test/samples/w3c/txml/test421.txml b/test/w3c/txml/test421.txml
index 4f92719..4f92719 100644
--- a/test/samples/w3c/txml/test421.txml
+++ b/test/w3c/txml/test421.txml
diff --git a/test/samples/w3c/txml/test422.txml b/test/w3c/txml/test422.txml
index 2e830d9..2e830d9 100644
--- a/test/samples/w3c/txml/test422.txml
+++ b/test/w3c/txml/test422.txml
diff --git a/test/samples/w3c/txml/test423.txml b/test/w3c/txml/test423.txml
index fd64587..fd64587 100644
--- a/test/samples/w3c/txml/test423.txml
+++ b/test/w3c/txml/test423.txml
diff --git a/test/samples/w3c/txml/test436.txml b/test/w3c/txml/test436.txml
index 5d403a2..5d403a2 100644
--- a/test/samples/w3c/txml/test436.txml
+++ b/test/w3c/txml/test436.txml
diff --git a/test/samples/w3c/txml/test444.txml b/test/w3c/txml/test444.txml
index 2483bdf..2483bdf 100644
--- a/test/samples/w3c/txml/test444.txml
+++ b/test/w3c/txml/test444.txml
diff --git a/test/samples/w3c/txml/test445.txml b/test/w3c/txml/test445.txml
index 0e12064..0e12064 100644
--- a/test/samples/w3c/txml/test445.txml
+++ b/test/w3c/txml/test445.txml
diff --git a/test/samples/w3c/txml/test448.txml b/test/w3c/txml/test448.txml
index 594064a..594064a 100644
--- a/test/samples/w3c/txml/test448.txml
+++ b/test/w3c/txml/test448.txml
diff --git a/test/samples/w3c/txml/test449.txml b/test/w3c/txml/test449.txml
index 3b5e183..3b5e183 100644
--- a/test/samples/w3c/txml/test449.txml
+++ b/test/w3c/txml/test449.txml
diff --git a/test/samples/w3c/txml/test451.txml b/test/w3c/txml/test451.txml
index cfb7f53..cfb7f53 100644
--- a/test/samples/w3c/txml/test451.txml
+++ b/test/w3c/txml/test451.txml
diff --git a/test/samples/w3c/txml/test452.txml b/test/w3c/txml/test452.txml
index a7d0ed0..a7d0ed0 100644
--- a/test/samples/w3c/txml/test452.txml
+++ b/test/w3c/txml/test452.txml
diff --git a/test/samples/w3c/txml/test453.txml b/test/w3c/txml/test453.txml
index e4e3fdd..e4e3fdd 100644
--- a/test/samples/w3c/txml/test453.txml
+++ b/test/w3c/txml/test453.txml
diff --git a/test/samples/w3c/txml/test456.txml b/test/w3c/txml/test456.txml
index e1365e0..e1365e0 100644
--- a/test/samples/w3c/txml/test456.txml
+++ b/test/w3c/txml/test456.txml
diff --git a/test/samples/w3c/txml/test457.txml b/test/w3c/txml/test457.txml
index 5bb856f..5bb856f 100644
--- a/test/samples/w3c/txml/test457.txml
+++ b/test/w3c/txml/test457.txml
diff --git a/test/samples/w3c/txml/test460.txml b/test/w3c/txml/test460.txml
index 10d1ce5..10d1ce5 100644
--- a/test/samples/w3c/txml/test460.txml
+++ b/test/w3c/txml/test460.txml
diff --git a/test/samples/w3c/txml/test463.txml b/test/w3c/txml/test463.txml
index dd7836b..dd7836b 100644
--- a/test/samples/w3c/txml/test463.txml
+++ b/test/w3c/txml/test463.txml
diff --git a/test/samples/w3c/txml/test464.txml b/test/w3c/txml/test464.txml
index 7781b8e..7781b8e 100644
--- a/test/samples/w3c/txml/test464.txml
+++ b/test/w3c/txml/test464.txml
diff --git a/test/samples/w3c/txml/test465.txml b/test/w3c/txml/test465.txml
index d7e1941..d7e1941 100644
--- a/test/samples/w3c/txml/test465.txml
+++ b/test/w3c/txml/test465.txml
diff --git a/test/samples/w3c/txml/test466.txml b/test/w3c/txml/test466.txml
index 251743e..251743e 100644
--- a/test/samples/w3c/txml/test466.txml
+++ b/test/w3c/txml/test466.txml
diff --git a/test/samples/w3c/txml/test467.txml b/test/w3c/txml/test467.txml
index 21ba39c..21ba39c 100644
--- a/test/samples/w3c/txml/test467.txml
+++ b/test/w3c/txml/test467.txml
diff --git a/test/samples/w3c/txml/test468.txml b/test/w3c/txml/test468.txml
index cefba19..cefba19 100644
--- a/test/samples/w3c/txml/test468.txml
+++ b/test/w3c/txml/test468.txml
diff --git a/test/samples/w3c/txml/test469.txml b/test/w3c/txml/test469.txml
index cdd5ef5..cdd5ef5 100644
--- a/test/samples/w3c/txml/test469.txml
+++ b/test/w3c/txml/test469.txml
diff --git a/test/samples/w3c/txml/test470.txml b/test/w3c/txml/test470.txml
index 556a670..556a670 100644
--- a/test/samples/w3c/txml/test470.txml
+++ b/test/w3c/txml/test470.txml
diff --git a/test/samples/w3c/txml/test473.txml b/test/w3c/txml/test473.txml
index 1b76058..1b76058 100644
--- a/test/samples/w3c/txml/test473.txml
+++ b/test/w3c/txml/test473.txml
diff --git a/test/samples/w3c/txml/test474.txml b/test/w3c/txml/test474.txml
index aab489b..aab489b 100644
--- a/test/samples/w3c/txml/test474.txml
+++ b/test/w3c/txml/test474.txml
diff --git a/test/samples/w3c/txml/test475.txml b/test/w3c/txml/test475.txml
index c7f860a..c7f860a 100644
--- a/test/samples/w3c/txml/test475.txml
+++ b/test/w3c/txml/test475.txml
diff --git a/test/samples/w3c/txml/test476.txml b/test/w3c/txml/test476.txml
index 59e620b..59e620b 100644
--- a/test/samples/w3c/txml/test476.txml
+++ b/test/w3c/txml/test476.txml
diff --git a/test/samples/w3c/txml/test477.txml b/test/w3c/txml/test477.txml
index e5a7b5b..e5a7b5b 100644
--- a/test/samples/w3c/txml/test477.txml
+++ b/test/w3c/txml/test477.txml
diff --git a/test/samples/w3c/txml/test478.txml b/test/w3c/txml/test478.txml
index ecb23fc..ecb23fc 100644
--- a/test/samples/w3c/txml/test478.txml
+++ b/test/w3c/txml/test478.txml
diff --git a/test/samples/w3c/txml/test479.txml b/test/w3c/txml/test479.txml
index 62c2e96..62c2e96 100644
--- a/test/samples/w3c/txml/test479.txml
+++ b/test/w3c/txml/test479.txml
diff --git a/test/samples/w3c/txml/test480.txml b/test/w3c/txml/test480.txml
index 88687a6..88687a6 100644
--- a/test/samples/w3c/txml/test480.txml
+++ b/test/w3c/txml/test480.txml
diff --git a/test/samples/w3c/txml/test481.txml b/test/w3c/txml/test481.txml
index 48f73e8..48f73e8 100644
--- a/test/samples/w3c/txml/test481.txml
+++ b/test/w3c/txml/test481.txml
diff --git a/test/samples/w3c/txml/test482.txml b/test/w3c/txml/test482.txml
index 9e3c2ff..9e3c2ff 100644
--- a/test/samples/w3c/txml/test482.txml
+++ b/test/w3c/txml/test482.txml
diff --git a/test/samples/w3c/txml/test483.txml b/test/w3c/txml/test483.txml
index 7eab75b..7eab75b 100644
--- a/test/samples/w3c/txml/test483.txml
+++ b/test/w3c/txml/test483.txml
diff --git a/test/samples/w3c/txml/test487.txml b/test/w3c/txml/test487.txml
index 7210c2b..7210c2b 100644
--- a/test/samples/w3c/txml/test487.txml
+++ b/test/w3c/txml/test487.txml
diff --git a/test/samples/w3c/txml/test488.txml b/test/w3c/txml/test488.txml
index 49c338a..49c338a 100644
--- a/test/samples/w3c/txml/test488.txml
+++ b/test/w3c/txml/test488.txml
diff --git a/test/samples/w3c/txml/test495.txml b/test/w3c/txml/test495.txml
index a2cf76c5..a2cf76c5 100644
--- a/test/samples/w3c/txml/test495.txml
+++ b/test/w3c/txml/test495.txml
diff --git a/test/samples/w3c/txml/test500.txml b/test/w3c/txml/test500.txml
index 21ed2ff..21ed2ff 100644
--- a/test/samples/w3c/txml/test500.txml
+++ b/test/w3c/txml/test500.txml
diff --git a/test/samples/w3c/txml/test501.txml b/test/w3c/txml/test501.txml
index 772edc8..772edc8 100644
--- a/test/samples/w3c/txml/test501.txml
+++ b/test/w3c/txml/test501.txml
diff --git a/test/samples/w3c/txml/test503.txml b/test/w3c/txml/test503.txml
index d15bb7e..d15bb7e 100644
--- a/test/samples/w3c/txml/test503.txml
+++ b/test/w3c/txml/test503.txml
diff --git a/test/samples/w3c/txml/test504.txml b/test/w3c/txml/test504.txml
index 62f601b..62f601b 100644
--- a/test/samples/w3c/txml/test504.txml
+++ b/test/w3c/txml/test504.txml
diff --git a/test/samples/w3c/txml/test505.txml b/test/w3c/txml/test505.txml
index b141186..b141186 100644
--- a/test/samples/w3c/txml/test505.txml
+++ b/test/w3c/txml/test505.txml
diff --git a/test/samples/w3c/txml/test506.txml b/test/w3c/txml/test506.txml
index b820ad5..b820ad5 100644
--- a/test/samples/w3c/txml/test506.txml
+++ b/test/w3c/txml/test506.txml
diff --git a/test/samples/w3c/txml/test509.txml b/test/w3c/txml/test509.txml
index 3140456..3140456 100644
--- a/test/samples/w3c/txml/test509.txml
+++ b/test/w3c/txml/test509.txml
diff --git a/test/samples/w3c/txml/test510.txml b/test/w3c/txml/test510.txml
index 9ffa2ea..9ffa2ea 100644
--- a/test/samples/w3c/txml/test510.txml
+++ b/test/w3c/txml/test510.txml
diff --git a/test/samples/w3c/txml/test513.txml b/test/w3c/txml/test513.txml
index 65dda29..65dda29 100644
--- a/test/samples/w3c/txml/test513.txml
+++ b/test/w3c/txml/test513.txml
diff --git a/test/samples/w3c/txml/test518.txml b/test/w3c/txml/test518.txml
index b1314ee..b1314ee 100644
--- a/test/samples/w3c/txml/test518.txml
+++ b/test/w3c/txml/test518.txml
diff --git a/test/samples/w3c/txml/test519.txml b/test/w3c/txml/test519.txml
index 67b64cc..67b64cc 100644
--- a/test/samples/w3c/txml/test519.txml
+++ b/test/w3c/txml/test519.txml
diff --git a/test/samples/w3c/txml/test520.txml b/test/w3c/txml/test520.txml
index 32ada62..32ada62 100644
--- a/test/samples/w3c/txml/test520.txml
+++ b/test/w3c/txml/test520.txml
diff --git a/test/samples/w3c/txml/test521.txml b/test/w3c/txml/test521.txml
index 75743ef..75743ef 100644
--- a/test/samples/w3c/txml/test521.txml
+++ b/test/w3c/txml/test521.txml
diff --git a/test/samples/w3c/txml/test522.txml b/test/w3c/txml/test522.txml
index 2d7b35d..2d7b35d 100644
--- a/test/samples/w3c/txml/test522.txml
+++ b/test/w3c/txml/test522.txml
diff --git a/test/samples/w3c/txml/test525.txml b/test/w3c/txml/test525.txml
index 4b367eb..4b367eb 100644
--- a/test/samples/w3c/txml/test525.txml
+++ b/test/w3c/txml/test525.txml
diff --git a/test/samples/w3c/txml/test527.txml b/test/w3c/txml/test527.txml
index 80894a7..80894a7 100644
--- a/test/samples/w3c/txml/test527.txml
+++ b/test/w3c/txml/test527.txml
diff --git a/test/samples/w3c/txml/test528.txml b/test/w3c/txml/test528.txml
index 271bb1c..271bb1c 100644
--- a/test/samples/w3c/txml/test528.txml
+++ b/test/w3c/txml/test528.txml
diff --git a/test/samples/w3c/txml/test529.txml b/test/w3c/txml/test529.txml
index 6a6656c..6a6656c 100644
--- a/test/samples/w3c/txml/test529.txml
+++ b/test/w3c/txml/test529.txml
diff --git a/test/samples/w3c/txml/test530.txml b/test/w3c/txml/test530.txml
index d64a8d8..d64a8d8 100644
--- a/test/samples/w3c/txml/test530.txml
+++ b/test/w3c/txml/test530.txml
diff --git a/test/samples/w3c/txml/test531.txml b/test/w3c/txml/test531.txml
index cffe7b5..cffe7b5 100644
--- a/test/samples/w3c/txml/test531.txml
+++ b/test/w3c/txml/test531.txml
diff --git a/test/samples/w3c/txml/test532.txml b/test/w3c/txml/test532.txml
index e8de172..e8de172 100644
--- a/test/samples/w3c/txml/test532.txml
+++ b/test/w3c/txml/test532.txml
diff --git a/test/samples/w3c/txml/test533.txml b/test/w3c/txml/test533.txml
index 7a6c82a..7a6c82a 100644
--- a/test/samples/w3c/txml/test533.txml
+++ b/test/w3c/txml/test533.txml
diff --git a/test/samples/w3c/txml/test534.txml b/test/w3c/txml/test534.txml
index e02123d..e02123d 100644
--- a/test/samples/w3c/txml/test534.txml
+++ b/test/w3c/txml/test534.txml
diff --git a/test/samples/w3c/txml/test537.txml b/test/w3c/txml/test537.txml
index 55ea102..55ea102 100644
--- a/test/samples/w3c/txml/test537.txml
+++ b/test/w3c/txml/test537.txml
diff --git a/test/samples/w3c/txml/test539.txml b/test/w3c/txml/test539.txml
index 3f0bd00..3f0bd00 100644
--- a/test/samples/w3c/txml/test539.txml
+++ b/test/w3c/txml/test539.txml
diff --git a/test/samples/w3c/txml/test539.txt b/test/w3c/txml/test539.txt
index de1b0a1..de1b0a1 100644
--- a/test/samples/w3c/txml/test539.txt
+++ b/test/w3c/txml/test539.txt
diff --git a/test/samples/w3c/txml/test540.txml b/test/w3c/txml/test540.txml
index 865bb24..865bb24 100644
--- a/test/samples/w3c/txml/test540.txml
+++ b/test/w3c/txml/test540.txml
diff --git a/test/samples/w3c/txml/test540.txt b/test/w3c/txml/test540.txt
index 2191239..2191239 100644
--- a/test/samples/w3c/txml/test540.txt
+++ b/test/w3c/txml/test540.txt
diff --git a/test/samples/w3c/txml/test542.txml b/test/w3c/txml/test542.txml
index 95ea8e6..95ea8e6 100644
--- a/test/samples/w3c/txml/test542.txml
+++ b/test/w3c/txml/test542.txml
diff --git a/test/samples/w3c/txml/test543.txml b/test/w3c/txml/test543.txml
index d179749..d179749 100644
--- a/test/samples/w3c/txml/test543.txml
+++ b/test/w3c/txml/test543.txml
diff --git a/test/samples/w3c/txml/test544.txml b/test/w3c/txml/test544.txml
index e0ab1da..e0ab1da 100644
--- a/test/samples/w3c/txml/test544.txml
+++ b/test/w3c/txml/test544.txml
diff --git a/test/samples/w3c/txml/test546.txml b/test/w3c/txml/test546.txml
index b8f0762..b8f0762 100644
--- a/test/samples/w3c/txml/test546.txml
+++ b/test/w3c/txml/test546.txml
diff --git a/test/samples/w3c/txml/test547.txml b/test/w3c/txml/test547.txml
index 35c415d..35c415d 100644
--- a/test/samples/w3c/txml/test547.txml
+++ b/test/w3c/txml/test547.txml
diff --git a/test/samples/w3c/txml/test550.txml b/test/w3c/txml/test550.txml
index 89f55a7..89f55a7 100644
--- a/test/samples/w3c/txml/test550.txml
+++ b/test/w3c/txml/test550.txml
diff --git a/test/samples/w3c/txml/test551.txml b/test/w3c/txml/test551.txml
index 45c6bf8..45c6bf8 100644
--- a/test/samples/w3c/txml/test551.txml
+++ b/test/w3c/txml/test551.txml
diff --git a/test/samples/w3c/txml/test552.txml b/test/w3c/txml/test552.txml
index 9489b3e..9489b3e 100644
--- a/test/samples/w3c/txml/test552.txml
+++ b/test/w3c/txml/test552.txml
diff --git a/test/samples/w3c/txml/test552.txt b/test/w3c/txml/test552.txt
index d8263ee..d8263ee 100644
--- a/test/samples/w3c/txml/test552.txt
+++ b/test/w3c/txml/test552.txt
diff --git a/test/samples/w3c/txml/test553.txml b/test/w3c/txml/test553.txml
index 322d4bb..322d4bb 100644
--- a/test/samples/w3c/txml/test553.txml
+++ b/test/w3c/txml/test553.txml
diff --git a/test/samples/w3c/txml/test554.txml b/test/w3c/txml/test554.txml
index d9ad55b..d9ad55b 100644
--- a/test/samples/w3c/txml/test554.txml
+++ b/test/w3c/txml/test554.txml
diff --git a/test/samples/w3c/txml/test555.txml b/test/w3c/txml/test555.txml
index 12fc459..12fc459 100644
--- a/test/samples/w3c/txml/test555.txml
+++ b/test/w3c/txml/test555.txml
diff --git a/test/samples/w3c/txml/test557.txml b/test/w3c/txml/test557.txml
index 560c9db..560c9db 100644
--- a/test/samples/w3c/txml/test557.txml
+++ b/test/w3c/txml/test557.txml
diff --git a/test/samples/w3c/txml/test557.txt b/test/w3c/txml/test557.txt
index a8e51da..a8e51da 100644
--- a/test/samples/w3c/txml/test557.txt
+++ b/test/w3c/txml/test557.txt
diff --git a/test/samples/w3c/txml/test558.txml b/test/w3c/txml/test558.txml
index a2491e2..a2491e2 100644
--- a/test/samples/w3c/txml/test558.txml
+++ b/test/w3c/txml/test558.txml
diff --git a/test/samples/w3c/txml/test558.txt b/test/w3c/txml/test558.txt
index bb2bcc7..bb2bcc7 100644
--- a/test/samples/w3c/txml/test558.txt
+++ b/test/w3c/txml/test558.txt
diff --git a/test/samples/w3c/txml/test560.txml b/test/w3c/txml/test560.txml
index 579422a..579422a 100644
--- a/test/samples/w3c/txml/test560.txml
+++ b/test/w3c/txml/test560.txml
diff --git a/test/samples/w3c/txml/test561.txml b/test/w3c/txml/test561.txml
index 4b7ec8e..4b7ec8e 100644
--- a/test/samples/w3c/txml/test561.txml
+++ b/test/w3c/txml/test561.txml
diff --git a/test/samples/w3c/txml/test562.txml b/test/w3c/txml/test562.txml
index a006018..a006018 100644
--- a/test/samples/w3c/txml/test562.txml
+++ b/test/w3c/txml/test562.txml
diff --git a/test/samples/w3c/txml/test567.txml b/test/w3c/txml/test567.txml
index d15953f..d15953f 100644
--- a/test/samples/w3c/txml/test567.txml
+++ b/test/w3c/txml/test567.txml
diff --git a/test/samples/w3c/txml/test568.txml b/test/w3c/txml/test568.txml
index 89efe73..89efe73 100644
--- a/test/samples/w3c/txml/test568.txml
+++ b/test/w3c/txml/test568.txml
diff --git a/test/samples/w3c/txml/test569.txml b/test/w3c/txml/test569.txml
index 276bd47..276bd47 100644
--- a/test/samples/w3c/txml/test569.txml
+++ b/test/w3c/txml/test569.txml
diff --git a/test/samples/w3c/txml/test570.txml b/test/w3c/txml/test570.txml
index 6584d9a..6584d9a 100644
--- a/test/samples/w3c/txml/test570.txml
+++ b/test/w3c/txml/test570.txml
diff --git a/test/samples/w3c/txml/test576.txml b/test/w3c/txml/test576.txml
index 4c4b34a..4c4b34a 100644
--- a/test/samples/w3c/txml/test576.txml
+++ b/test/w3c/txml/test576.txml
diff --git a/test/samples/w3c/txml/test578.txml b/test/w3c/txml/test578.txml
index a4de932..a4de932 100644
--- a/test/samples/w3c/txml/test578.txml
+++ b/test/w3c/txml/test578.txml
diff --git a/test/samples/w3c/update-txml.sh b/test/w3c/update-txml.sh
index 074318d..074318d 100755
--- a/test/samples/w3c/update-txml.sh
+++ b/test/w3c/update-txml.sh
diff --git a/test/samples/w3c/ecma/robots.txt b/test/w3c/xpath/robots.txt
index 54f3e01..54f3e01 100644
--- a/test/samples/w3c/ecma/robots.txt
+++ b/test/w3c/xpath/robots.txt
diff --git a/test/samples/w3c/xpath/test144.scxml b/test/w3c/xpath/test144.scxml
index 612f793..612f793 100644
--- a/test/samples/w3c/xpath/test144.scxml
+++ b/test/w3c/xpath/test144.scxml
diff --git a/test/samples/w3c/xpath/test147.scxml b/test/w3c/xpath/test147.scxml
index d07b56d..d07b56d 100644
--- a/test/samples/w3c/xpath/test147.scxml
+++ b/test/w3c/xpath/test147.scxml
diff --git a/test/samples/w3c/xpath/test148.scxml b/test/w3c/xpath/test148.scxml
index 805c223..805c223 100644
--- a/test/samples/w3c/xpath/test148.scxml
+++ b/test/w3c/xpath/test148.scxml
diff --git a/test/samples/w3c/xpath/test149.scxml b/test/w3c/xpath/test149.scxml
index 547fdc3..547fdc3 100644
--- a/test/samples/w3c/xpath/test149.scxml
+++ b/test/w3c/xpath/test149.scxml
diff --git a/test/samples/w3c/xpath/test150.scxml b/test/w3c/xpath/test150.scxml
index afa8909..afa8909 100644
--- a/test/samples/w3c/xpath/test150.scxml
+++ b/test/w3c/xpath/test150.scxml
diff --git a/test/samples/w3c/xpath/test151.scxml b/test/w3c/xpath/test151.scxml
index 5933b09..5933b09 100644
--- a/test/samples/w3c/xpath/test151.scxml
+++ b/test/w3c/xpath/test151.scxml
diff --git a/test/samples/w3c/xpath/test152.scxml b/test/w3c/xpath/test152.scxml
index 1ebbf38..1ebbf38 100644
--- a/test/samples/w3c/xpath/test152.scxml
+++ b/test/w3c/xpath/test152.scxml
diff --git a/test/samples/w3c/xpath/test153.scxml b/test/w3c/xpath/test153.scxml
index 35b22bc..35b22bc 100644
--- a/test/samples/w3c/xpath/test153.scxml
+++ b/test/w3c/xpath/test153.scxml
diff --git a/test/samples/w3c/xpath/test155.scxml b/test/w3c/xpath/test155.scxml
index 553861e..553861e 100644
--- a/test/samples/w3c/xpath/test155.scxml
+++ b/test/w3c/xpath/test155.scxml
diff --git a/test/samples/w3c/xpath/test156.scxml b/test/w3c/xpath/test156.scxml
index 3ed65b4..3ed65b4 100644
--- a/test/samples/w3c/xpath/test156.scxml
+++ b/test/w3c/xpath/test156.scxml
diff --git a/test/samples/w3c/xpath/test158.scxml b/test/w3c/xpath/test158.scxml
index c682c5f..c682c5f 100644
--- a/test/samples/w3c/xpath/test158.scxml
+++ b/test/w3c/xpath/test158.scxml
diff --git a/test/samples/w3c/xpath/test159.scxml b/test/w3c/xpath/test159.scxml
index 1f2af35..1f2af35 100644
--- a/test/samples/w3c/xpath/test159.scxml
+++ b/test/w3c/xpath/test159.scxml
diff --git a/test/samples/w3c/xpath/test172.scxml b/test/w3c/xpath/test172.scxml
index 9a8e019..9a8e019 100644
--- a/test/samples/w3c/xpath/test172.scxml
+++ b/test/w3c/xpath/test172.scxml
diff --git a/test/samples/w3c/xpath/test173.scxml b/test/w3c/xpath/test173.scxml
index 3e4a97d..3e4a97d 100644
--- a/test/samples/w3c/xpath/test173.scxml
+++ b/test/w3c/xpath/test173.scxml
diff --git a/test/samples/w3c/xpath/test174.scxml b/test/w3c/xpath/test174.scxml
index 5a7254e..5a7254e 100644
--- a/test/samples/w3c/xpath/test174.scxml
+++ b/test/w3c/xpath/test174.scxml
diff --git a/test/samples/w3c/xpath/test175.scxml b/test/w3c/xpath/test175.scxml
index 8dfd670..8dfd670 100644
--- a/test/samples/w3c/xpath/test175.scxml
+++ b/test/w3c/xpath/test175.scxml
diff --git a/test/samples/w3c/xpath/test176.scxml b/test/w3c/xpath/test176.scxml
index 7b59453..7b59453 100644
--- a/test/samples/w3c/xpath/test176.scxml
+++ b/test/w3c/xpath/test176.scxml
diff --git a/test/samples/w3c/xpath/test178.scxml b/test/w3c/xpath/test178.scxml
index 86922d1..86922d1 100644
--- a/test/samples/w3c/xpath/test178.scxml
+++ b/test/w3c/xpath/test178.scxml
diff --git a/test/samples/w3c/xpath/test179.scxml b/test/w3c/xpath/test179.scxml
index 1c281b5..1c281b5 100644
--- a/test/samples/w3c/xpath/test179.scxml
+++ b/test/w3c/xpath/test179.scxml
diff --git a/test/samples/w3c/xpath/test183.scxml b/test/w3c/xpath/test183.scxml
index dcb5bb3..dcb5bb3 100644
--- a/test/samples/w3c/xpath/test183.scxml
+++ b/test/w3c/xpath/test183.scxml
diff --git a/test/samples/w3c/xpath/test185.scxml b/test/w3c/xpath/test185.scxml
index c6b4b48..c6b4b48 100644
--- a/test/samples/w3c/xpath/test185.scxml
+++ b/test/w3c/xpath/test185.scxml
diff --git a/test/samples/w3c/xpath/test186.scxml b/test/w3c/xpath/test186.scxml
index 8353bf2..8353bf2 100644
--- a/test/samples/w3c/xpath/test186.scxml
+++ b/test/w3c/xpath/test186.scxml
diff --git a/test/samples/w3c/xpath/test187.scxml b/test/w3c/xpath/test187.scxml
index 12cbb8b..12cbb8b 100644
--- a/test/samples/w3c/xpath/test187.scxml
+++ b/test/w3c/xpath/test187.scxml
diff --git a/test/samples/w3c/xpath/test189.scxml b/test/w3c/xpath/test189.scxml
index 3b5d34e..3b5d34e 100644
--- a/test/samples/w3c/xpath/test189.scxml
+++ b/test/w3c/xpath/test189.scxml
diff --git a/test/samples/w3c/xpath/test190.scxml b/test/w3c/xpath/test190.scxml
index 7458f66..7458f66 100644
--- a/test/samples/w3c/xpath/test190.scxml
+++ b/test/w3c/xpath/test190.scxml
diff --git a/test/samples/w3c/xpath/test191.scxml b/test/w3c/xpath/test191.scxml
index 1910eaf..1910eaf 100644
--- a/test/samples/w3c/xpath/test191.scxml
+++ b/test/w3c/xpath/test191.scxml
diff --git a/test/samples/w3c/xpath/test192.scxml b/test/w3c/xpath/test192.scxml
index 81d185d..81d185d 100644
--- a/test/samples/w3c/xpath/test192.scxml
+++ b/test/w3c/xpath/test192.scxml
diff --git a/test/samples/w3c/xpath/test193.scxml b/test/w3c/xpath/test193.scxml
index 58a5c67..58a5c67 100644
--- a/test/samples/w3c/xpath/test193.scxml
+++ b/test/w3c/xpath/test193.scxml
diff --git a/test/samples/w3c/xpath/test194.scxml b/test/w3c/xpath/test194.scxml
index 523400b..523400b 100644
--- a/test/samples/w3c/xpath/test194.scxml
+++ b/test/w3c/xpath/test194.scxml
diff --git a/test/samples/w3c/xpath/test198.scxml b/test/w3c/xpath/test198.scxml
index 23ca478..23ca478 100644
--- a/test/samples/w3c/xpath/test198.scxml
+++ b/test/w3c/xpath/test198.scxml
diff --git a/test/samples/w3c/xpath/test199.scxml b/test/w3c/xpath/test199.scxml
index 9c8f734..9c8f734 100644
--- a/test/samples/w3c/xpath/test199.scxml
+++ b/test/w3c/xpath/test199.scxml
diff --git a/test/samples/w3c/xpath/test200.scxml b/test/w3c/xpath/test200.scxml
index 182ada4..182ada4 100644
--- a/test/samples/w3c/xpath/test200.scxml
+++ b/test/w3c/xpath/test200.scxml
diff --git a/test/samples/w3c/xpath/test201.scxml b/test/w3c/xpath/test201.scxml
index 8f4e285..8f4e285 100644
--- a/test/samples/w3c/xpath/test201.scxml
+++ b/test/w3c/xpath/test201.scxml
diff --git a/test/samples/w3c/xpath/test205.scxml b/test/w3c/xpath/test205.scxml
index d6a02e2..d6a02e2 100644
--- a/test/samples/w3c/xpath/test205.scxml
+++ b/test/w3c/xpath/test205.scxml
diff --git a/test/samples/w3c/xpath/test207.scxml b/test/w3c/xpath/test207.scxml
index e74ec8f..e74ec8f 100644
--- a/test/samples/w3c/xpath/test207.scxml
+++ b/test/w3c/xpath/test207.scxml
diff --git a/test/samples/w3c/xpath/test208.scxml b/test/w3c/xpath/test208.scxml
index e768e7c..e768e7c 100644
--- a/test/samples/w3c/xpath/test208.scxml
+++ b/test/w3c/xpath/test208.scxml
diff --git a/test/samples/w3c/xpath/test210.scxml b/test/w3c/xpath/test210.scxml
index 5ec8f23..5ec8f23 100644
--- a/test/samples/w3c/xpath/test210.scxml
+++ b/test/w3c/xpath/test210.scxml
diff --git a/test/samples/w3c/xpath/test215.scxml b/test/w3c/xpath/test215.scxml
index 4aebe84..4aebe84 100644
--- a/test/samples/w3c/xpath/test215.scxml
+++ b/test/w3c/xpath/test215.scxml
diff --git a/test/samples/w3c/xpath/test216.scxml b/test/w3c/xpath/test216.scxml
index 901ad6f..901ad6f 100644
--- a/test/samples/w3c/xpath/test216.scxml
+++ b/test/w3c/xpath/test216.scxml
diff --git a/test/samples/w3c/xpath/test216sub1.scxml b/test/w3c/xpath/test216sub1.scxml
index f5c49a1..f5c49a1 100644
--- a/test/samples/w3c/xpath/test216sub1.scxml
+++ b/test/w3c/xpath/test216sub1.scxml
diff --git a/test/samples/w3c/xpath/test220.scxml b/test/w3c/xpath/test220.scxml
index 15f66ba..15f66ba 100644
--- a/test/samples/w3c/xpath/test220.scxml
+++ b/test/w3c/xpath/test220.scxml
diff --git a/test/samples/w3c/xpath/test223.scxml b/test/w3c/xpath/test223.scxml
index 08f2ee4..08f2ee4 100644
--- a/test/samples/w3c/xpath/test223.scxml
+++ b/test/w3c/xpath/test223.scxml
diff --git a/test/samples/w3c/xpath/test224.scxml b/test/w3c/xpath/test224.scxml
index 8c74c4e..8c74c4e 100644
--- a/test/samples/w3c/xpath/test224.scxml
+++ b/test/w3c/xpath/test224.scxml
diff --git a/test/samples/w3c/xpath/test225.scxml b/test/w3c/xpath/test225.scxml
index a43cdab..a43cdab 100644
--- a/test/samples/w3c/xpath/test225.scxml
+++ b/test/w3c/xpath/test225.scxml
diff --git a/test/samples/w3c/xpath/test226.scxml b/test/w3c/xpath/test226.scxml
index 4b717b2..4b717b2 100644
--- a/test/samples/w3c/xpath/test226.scxml
+++ b/test/w3c/xpath/test226.scxml
diff --git a/test/samples/w3c/xpath/test226sub1.scxml b/test/w3c/xpath/test226sub1.scxml
index 9ac7b9a..9ac7b9a 100644
--- a/test/samples/w3c/xpath/test226sub1.scxml
+++ b/test/w3c/xpath/test226sub1.scxml
diff --git a/test/samples/w3c/xpath/test228.scxml b/test/w3c/xpath/test228.scxml
index 9afa343..9afa343 100644
--- a/test/samples/w3c/xpath/test228.scxml
+++ b/test/w3c/xpath/test228.scxml
diff --git a/test/samples/w3c/xpath/test229.scxml b/test/w3c/xpath/test229.scxml
index 747f77c..747f77c 100644
--- a/test/samples/w3c/xpath/test229.scxml
+++ b/test/w3c/xpath/test229.scxml
diff --git a/test/samples/w3c/xpath/test230.scxml b/test/w3c/xpath/test230.scxml
index 51f8529..51f8529 100644
--- a/test/samples/w3c/xpath/test230.scxml
+++ b/test/w3c/xpath/test230.scxml
diff --git a/test/samples/w3c/xpath/test232.scxml b/test/w3c/xpath/test232.scxml
index f40627b..f40627b 100644
--- a/test/samples/w3c/xpath/test232.scxml
+++ b/test/w3c/xpath/test232.scxml
diff --git a/test/samples/w3c/xpath/test233.scxml b/test/w3c/xpath/test233.scxml
index c4d7eb7..c4d7eb7 100644
--- a/test/samples/w3c/xpath/test233.scxml
+++ b/test/w3c/xpath/test233.scxml
diff --git a/test/samples/w3c/xpath/test234.scxml b/test/w3c/xpath/test234.scxml
index bf06eba..bf06eba 100644
--- a/test/samples/w3c/xpath/test234.scxml
+++ b/test/w3c/xpath/test234.scxml
diff --git a/test/samples/w3c/xpath/test235.scxml b/test/w3c/xpath/test235.scxml
index 1b06a4c..1b06a4c 100644
--- a/test/samples/w3c/xpath/test235.scxml
+++ b/test/w3c/xpath/test235.scxml
diff --git a/test/samples/w3c/xpath/test236.scxml b/test/w3c/xpath/test236.scxml
index 2c2d41a..2c2d41a 100644
--- a/test/samples/w3c/xpath/test236.scxml
+++ b/test/w3c/xpath/test236.scxml
diff --git a/test/samples/w3c/xpath/test237.scxml b/test/w3c/xpath/test237.scxml
index 19c2480..19c2480 100644
--- a/test/samples/w3c/xpath/test237.scxml
+++ b/test/w3c/xpath/test237.scxml
diff --git a/test/samples/w3c/xpath/test239.scxml b/test/w3c/xpath/test239.scxml
index b7fcfc2..b7fcfc2 100644
--- a/test/samples/w3c/xpath/test239.scxml
+++ b/test/w3c/xpath/test239.scxml
diff --git a/test/samples/w3c/xpath/test239sub1.scxml b/test/w3c/xpath/test239sub1.scxml
index 510f4a0..510f4a0 100644
--- a/test/samples/w3c/xpath/test239sub1.scxml
+++ b/test/w3c/xpath/test239sub1.scxml
diff --git a/test/samples/w3c/xpath/test240.scxml b/test/w3c/xpath/test240.scxml
index ddf92c6..ddf92c6 100644
--- a/test/samples/w3c/xpath/test240.scxml
+++ b/test/w3c/xpath/test240.scxml
diff --git a/test/samples/w3c/xpath/test241.scxml b/test/w3c/xpath/test241.scxml
index 377aa4d..377aa4d 100644
--- a/test/samples/w3c/xpath/test241.scxml
+++ b/test/w3c/xpath/test241.scxml
diff --git a/test/samples/w3c/xpath/test242.scxml b/test/w3c/xpath/test242.scxml
index a6f1798..a6f1798 100644
--- a/test/samples/w3c/xpath/test242.scxml
+++ b/test/w3c/xpath/test242.scxml
diff --git a/test/samples/w3c/xpath/test242sub1.scxml b/test/w3c/xpath/test242sub1.scxml
index 510f4a0..510f4a0 100644
--- a/test/samples/w3c/xpath/test242sub1.scxml
+++ b/test/w3c/xpath/test242sub1.scxml
diff --git a/test/samples/w3c/xpath/test243.scxml b/test/w3c/xpath/test243.scxml
index dceb40e..dceb40e 100644
--- a/test/samples/w3c/xpath/test243.scxml
+++ b/test/w3c/xpath/test243.scxml
diff --git a/test/samples/w3c/xpath/test244.scxml b/test/w3c/xpath/test244.scxml
index 307e556..307e556 100644
--- a/test/samples/w3c/xpath/test244.scxml
+++ b/test/w3c/xpath/test244.scxml
diff --git a/test/samples/w3c/xpath/test245.scxml b/test/w3c/xpath/test245.scxml
index b9cbddb..b9cbddb 100644
--- a/test/samples/w3c/xpath/test245.scxml
+++ b/test/w3c/xpath/test245.scxml
diff --git a/test/samples/w3c/xpath/test247.scxml b/test/w3c/xpath/test247.scxml
index 16a6a5f..16a6a5f 100644
--- a/test/samples/w3c/xpath/test247.scxml
+++ b/test/w3c/xpath/test247.scxml
diff --git a/test/samples/w3c/xpath/test250.scxml b/test/w3c/xpath/test250.scxml
index 3884425..3884425 100644
--- a/test/samples/w3c/xpath/test250.scxml
+++ b/test/w3c/xpath/test250.scxml
diff --git a/test/samples/w3c/xpath/test252.scxml b/test/w3c/xpath/test252.scxml
index 1f92127..1f92127 100644
--- a/test/samples/w3c/xpath/test252.scxml
+++ b/test/w3c/xpath/test252.scxml
diff --git a/test/samples/w3c/xpath/test253.scxml b/test/w3c/xpath/test253.scxml
index f894ea9..f894ea9 100644
--- a/test/samples/w3c/xpath/test253.scxml
+++ b/test/w3c/xpath/test253.scxml
diff --git a/test/samples/w3c/xpath/test276.scxml b/test/w3c/xpath/test276.scxml
index 026e0fc..026e0fc 100644
--- a/test/samples/w3c/xpath/test276.scxml
+++ b/test/w3c/xpath/test276.scxml
diff --git a/test/samples/w3c/xpath/test276sub1.scxml b/test/w3c/xpath/test276sub1.scxml
index 5c6ab45..5c6ab45 100644
--- a/test/samples/w3c/xpath/test276sub1.scxml
+++ b/test/w3c/xpath/test276sub1.scxml
diff --git a/test/samples/w3c/xpath/test277.scxml b/test/w3c/xpath/test277.scxml
index 6dc520e..6dc520e 100644
--- a/test/samples/w3c/xpath/test277.scxml
+++ b/test/w3c/xpath/test277.scxml
diff --git a/test/samples/w3c/xpath/test278.scxml b/test/w3c/xpath/test278.scxml
index 93461be..93461be 100644
--- a/test/samples/w3c/xpath/test278.scxml
+++ b/test/w3c/xpath/test278.scxml
diff --git a/test/samples/w3c/xpath/test279.scxml b/test/w3c/xpath/test279.scxml
index 314b927..314b927 100644
--- a/test/samples/w3c/xpath/test279.scxml
+++ b/test/w3c/xpath/test279.scxml
diff --git a/test/samples/w3c/xpath/test280.scxml b/test/w3c/xpath/test280.scxml
index 79bb2e5..79bb2e5 100644
--- a/test/samples/w3c/xpath/test280.scxml
+++ b/test/w3c/xpath/test280.scxml
diff --git a/test/samples/w3c/xpath/test286.scxml b/test/w3c/xpath/test286.scxml
index 80c0046..80c0046 100644
--- a/test/samples/w3c/xpath/test286.scxml
+++ b/test/w3c/xpath/test286.scxml
diff --git a/test/samples/w3c/xpath/test287.scxml b/test/w3c/xpath/test287.scxml
index 9d10690..9d10690 100644
--- a/test/samples/w3c/xpath/test287.scxml
+++ b/test/w3c/xpath/test287.scxml
diff --git a/test/samples/w3c/xpath/test294.scxml b/test/w3c/xpath/test294.scxml
index 362f2a6..362f2a6 100644
--- a/test/samples/w3c/xpath/test294.scxml
+++ b/test/w3c/xpath/test294.scxml
diff --git a/test/samples/w3c/xpath/test298.scxml b/test/w3c/xpath/test298.scxml
index ab8a5a9..ab8a5a9 100644
--- a/test/samples/w3c/xpath/test298.scxml
+++ b/test/w3c/xpath/test298.scxml
diff --git a/test/samples/w3c/ecma/test301.scxml b/test/w3c/xpath/test301.scxml
index 59125c8..59125c8 100644
--- a/test/samples/w3c/ecma/test301.scxml
+++ b/test/w3c/xpath/test301.scxml
diff --git a/test/samples/w3c/xpath/test302.scxml b/test/w3c/xpath/test302.scxml
index 4ecb0b7..4ecb0b7 100644
--- a/test/samples/w3c/xpath/test302.scxml
+++ b/test/w3c/xpath/test302.scxml
diff --git a/test/samples/w3c/xpath/test303.scxml b/test/w3c/xpath/test303.scxml
index 490151a..490151a 100644
--- a/test/samples/w3c/xpath/test303.scxml
+++ b/test/w3c/xpath/test303.scxml
diff --git a/test/samples/w3c/xpath/test304.scxml b/test/w3c/xpath/test304.scxml
index 072b188..072b188 100644
--- a/test/samples/w3c/xpath/test304.scxml
+++ b/test/w3c/xpath/test304.scxml
diff --git a/test/samples/w3c/xpath/test307.scxml b/test/w3c/xpath/test307.scxml
index 369b6c8..369b6c8 100644
--- a/test/samples/w3c/xpath/test307.scxml
+++ b/test/w3c/xpath/test307.scxml
diff --git a/test/samples/w3c/xpath/test309.scxml b/test/w3c/xpath/test309.scxml
index b2ad07d..b2ad07d 100644
--- a/test/samples/w3c/xpath/test309.scxml
+++ b/test/w3c/xpath/test309.scxml
diff --git a/test/samples/w3c/xpath/test310.scxml b/test/w3c/xpath/test310.scxml
index 59e5bf0..59e5bf0 100644
--- a/test/samples/w3c/xpath/test310.scxml
+++ b/test/w3c/xpath/test310.scxml
diff --git a/test/samples/w3c/xpath/test311.scxml b/test/w3c/xpath/test311.scxml
index 487793c..487793c 100644
--- a/test/samples/w3c/xpath/test311.scxml
+++ b/test/w3c/xpath/test311.scxml
diff --git a/test/samples/w3c/xpath/test312.scxml b/test/w3c/xpath/test312.scxml
index 45ed889..45ed889 100644
--- a/test/samples/w3c/xpath/test312.scxml
+++ b/test/w3c/xpath/test312.scxml
diff --git a/test/samples/w3c/xpath/test313.scxml b/test/w3c/xpath/test313.scxml
index 0816115..0816115 100644
--- a/test/samples/w3c/xpath/test313.scxml
+++ b/test/w3c/xpath/test313.scxml
diff --git a/test/samples/w3c/xpath/test314.scxml b/test/w3c/xpath/test314.scxml
index 2d16107..2d16107 100644
--- a/test/samples/w3c/xpath/test314.scxml
+++ b/test/w3c/xpath/test314.scxml
diff --git a/test/samples/w3c/xpath/test318.scxml b/test/w3c/xpath/test318.scxml
index 2ee56d8..2ee56d8 100644
--- a/test/samples/w3c/xpath/test318.scxml
+++ b/test/w3c/xpath/test318.scxml
diff --git a/test/samples/w3c/xpath/test319.scxml b/test/w3c/xpath/test319.scxml
index f168e1a..f168e1a 100644
--- a/test/samples/w3c/xpath/test319.scxml
+++ b/test/w3c/xpath/test319.scxml
diff --git a/test/samples/w3c/xpath/test321.scxml b/test/w3c/xpath/test321.scxml
index 8905752..8905752 100644
--- a/test/samples/w3c/xpath/test321.scxml
+++ b/test/w3c/xpath/test321.scxml
diff --git a/test/samples/w3c/xpath/test322.scxml b/test/w3c/xpath/test322.scxml
index 437ff93..437ff93 100644
--- a/test/samples/w3c/xpath/test322.scxml
+++ b/test/w3c/xpath/test322.scxml
diff --git a/test/samples/w3c/xpath/test323.scxml b/test/w3c/xpath/test323.scxml
index 76a519f..76a519f 100644
--- a/test/samples/w3c/xpath/test323.scxml
+++ b/test/w3c/xpath/test323.scxml
diff --git a/test/samples/w3c/xpath/test324.scxml b/test/w3c/xpath/test324.scxml
index c3493e3..c3493e3 100644
--- a/test/samples/w3c/xpath/test324.scxml
+++ b/test/w3c/xpath/test324.scxml
diff --git a/test/samples/w3c/xpath/test325.scxml b/test/w3c/xpath/test325.scxml
index b85b47a..b85b47a 100644
--- a/test/samples/w3c/xpath/test325.scxml
+++ b/test/w3c/xpath/test325.scxml
diff --git a/test/samples/w3c/xpath/test326.scxml b/test/w3c/xpath/test326.scxml
index f6f69bc..f6f69bc 100644
--- a/test/samples/w3c/xpath/test326.scxml
+++ b/test/w3c/xpath/test326.scxml
diff --git a/test/samples/w3c/xpath/test329.scxml b/test/w3c/xpath/test329.scxml
index ad62f10..ad62f10 100644
--- a/test/samples/w3c/xpath/test329.scxml
+++ b/test/w3c/xpath/test329.scxml
diff --git a/test/samples/w3c/xpath/test330.scxml b/test/w3c/xpath/test330.scxml
index 353c683..353c683 100644
--- a/test/samples/w3c/xpath/test330.scxml
+++ b/test/w3c/xpath/test330.scxml
diff --git a/test/samples/w3c/xpath/test331.scxml b/test/w3c/xpath/test331.scxml
index aec6d98..aec6d98 100644
--- a/test/samples/w3c/xpath/test331.scxml
+++ b/test/w3c/xpath/test331.scxml
diff --git a/test/samples/w3c/xpath/test332.scxml b/test/w3c/xpath/test332.scxml
index 248f953..248f953 100644
--- a/test/samples/w3c/xpath/test332.scxml
+++ b/test/w3c/xpath/test332.scxml
diff --git a/test/samples/w3c/xpath/test333.scxml b/test/w3c/xpath/test333.scxml
index aff67bc..aff67bc 100644
--- a/test/samples/w3c/xpath/test333.scxml
+++ b/test/w3c/xpath/test333.scxml
diff --git a/test/samples/w3c/xpath/test335.scxml b/test/w3c/xpath/test335.scxml
index 004a688..004a688 100644
--- a/test/samples/w3c/xpath/test335.scxml
+++ b/test/w3c/xpath/test335.scxml
diff --git a/test/samples/w3c/xpath/test336.scxml b/test/w3c/xpath/test336.scxml
index 0ec410a..0ec410a 100644
--- a/test/samples/w3c/xpath/test336.scxml
+++ b/test/w3c/xpath/test336.scxml
diff --git a/test/samples/w3c/xpath/test337.scxml b/test/w3c/xpath/test337.scxml
index 5bb900e..5bb900e 100644
--- a/test/samples/w3c/xpath/test337.scxml
+++ b/test/w3c/xpath/test337.scxml
diff --git a/test/samples/w3c/xpath/test338.scxml b/test/w3c/xpath/test338.scxml
index d434749..d434749 100644
--- a/test/samples/w3c/xpath/test338.scxml
+++ b/test/w3c/xpath/test338.scxml
diff --git a/test/samples/w3c/xpath/test339.scxml b/test/w3c/xpath/test339.scxml
index 225b64f..225b64f 100644
--- a/test/samples/w3c/xpath/test339.scxml
+++ b/test/w3c/xpath/test339.scxml
diff --git a/test/samples/w3c/xpath/test342.scxml b/test/w3c/xpath/test342.scxml
index 5dd9b3d..5dd9b3d 100644
--- a/test/samples/w3c/xpath/test342.scxml
+++ b/test/w3c/xpath/test342.scxml
diff --git a/test/samples/w3c/xpath/test343.scxml b/test/w3c/xpath/test343.scxml
index bae14de..bae14de 100644
--- a/test/samples/w3c/xpath/test343.scxml
+++ b/test/w3c/xpath/test343.scxml
diff --git a/test/samples/w3c/xpath/test344.scxml b/test/w3c/xpath/test344.scxml
index 15f744e..15f744e 100644
--- a/test/samples/w3c/xpath/test344.scxml
+++ b/test/w3c/xpath/test344.scxml
diff --git a/test/samples/w3c/xpath/test346.scxml b/test/w3c/xpath/test346.scxml
index 5be7844..5be7844 100644
--- a/test/samples/w3c/xpath/test346.scxml
+++ b/test/w3c/xpath/test346.scxml
diff --git a/test/samples/w3c/xpath/test347.scxml b/test/w3c/xpath/test347.scxml
index 011f65f..011f65f 100644
--- a/test/samples/w3c/xpath/test347.scxml
+++ b/test/w3c/xpath/test347.scxml
diff --git a/test/samples/w3c/xpath/test348.scxml b/test/w3c/xpath/test348.scxml
index d55f797..d55f797 100644
--- a/test/samples/w3c/xpath/test348.scxml
+++ b/test/w3c/xpath/test348.scxml
diff --git a/test/samples/w3c/xpath/test349.scxml b/test/w3c/xpath/test349.scxml
index b162edc..b162edc 100644
--- a/test/samples/w3c/xpath/test349.scxml
+++ b/test/w3c/xpath/test349.scxml
diff --git a/test/samples/w3c/xpath/test350.scxml b/test/w3c/xpath/test350.scxml
index ce94e9f..ce94e9f 100644
--- a/test/samples/w3c/xpath/test350.scxml
+++ b/test/w3c/xpath/test350.scxml
diff --git a/test/samples/w3c/xpath/test351.scxml b/test/w3c/xpath/test351.scxml
index f75fab3..f75fab3 100644
--- a/test/samples/w3c/xpath/test351.scxml
+++ b/test/w3c/xpath/test351.scxml
diff --git a/test/samples/w3c/xpath/test352.scxml b/test/w3c/xpath/test352.scxml
index b8ea732..b8ea732 100644
--- a/test/samples/w3c/xpath/test352.scxml
+++ b/test/w3c/xpath/test352.scxml
diff --git a/test/samples/w3c/xpath/test354.scxml b/test/w3c/xpath/test354.scxml
index 93d768d..93d768d 100644
--- a/test/samples/w3c/xpath/test354.scxml
+++ b/test/w3c/xpath/test354.scxml
diff --git a/test/samples/w3c/xpath/test355.scxml b/test/w3c/xpath/test355.scxml
index af1dda6..af1dda6 100644
--- a/test/samples/w3c/xpath/test355.scxml
+++ b/test/w3c/xpath/test355.scxml
diff --git a/test/samples/w3c/xpath/test364.scxml b/test/w3c/xpath/test364.scxml
index 1130c72..1130c72 100644
--- a/test/samples/w3c/xpath/test364.scxml
+++ b/test/w3c/xpath/test364.scxml
diff --git a/test/samples/w3c/xpath/test372.scxml b/test/w3c/xpath/test372.scxml
index 3ddecb6..3ddecb6 100644
--- a/test/samples/w3c/xpath/test372.scxml
+++ b/test/w3c/xpath/test372.scxml
diff --git a/test/samples/w3c/xpath/test375.scxml b/test/w3c/xpath/test375.scxml
index b093149..b093149 100644
--- a/test/samples/w3c/xpath/test375.scxml
+++ b/test/w3c/xpath/test375.scxml
diff --git a/test/samples/w3c/xpath/test376.scxml b/test/w3c/xpath/test376.scxml
index 3f6edc5..3f6edc5 100644
--- a/test/samples/w3c/xpath/test376.scxml
+++ b/test/w3c/xpath/test376.scxml
diff --git a/test/samples/w3c/xpath/test377.scxml b/test/w3c/xpath/test377.scxml
index 1d2140f..1d2140f 100644
--- a/test/samples/w3c/xpath/test377.scxml
+++ b/test/w3c/xpath/test377.scxml
diff --git a/test/samples/w3c/xpath/test378.scxml b/test/w3c/xpath/test378.scxml
index 08fd658..08fd658 100644
--- a/test/samples/w3c/xpath/test378.scxml
+++ b/test/w3c/xpath/test378.scxml
diff --git a/test/samples/w3c/xpath/test387.scxml b/test/w3c/xpath/test387.scxml
index 7b59d23..7b59d23 100644
--- a/test/samples/w3c/xpath/test387.scxml
+++ b/test/w3c/xpath/test387.scxml
diff --git a/test/samples/w3c/xpath/test388.scxml b/test/w3c/xpath/test388.scxml
index 87e8c53..87e8c53 100644
--- a/test/samples/w3c/xpath/test388.scxml
+++ b/test/w3c/xpath/test388.scxml
diff --git a/test/samples/w3c/xpath/test396.scxml b/test/w3c/xpath/test396.scxml
index aa94936..aa94936 100644
--- a/test/samples/w3c/xpath/test396.scxml
+++ b/test/w3c/xpath/test396.scxml
diff --git a/test/samples/w3c/xpath/test399.scxml b/test/w3c/xpath/test399.scxml
index 922527f..922527f 100644
--- a/test/samples/w3c/xpath/test399.scxml
+++ b/test/w3c/xpath/test399.scxml
diff --git a/test/samples/w3c/xpath/test401.scxml b/test/w3c/xpath/test401.scxml
index 7900490..7900490 100644
--- a/test/samples/w3c/xpath/test401.scxml
+++ b/test/w3c/xpath/test401.scxml
diff --git a/test/samples/w3c/xpath/test402.scxml b/test/w3c/xpath/test402.scxml
index 4a822c8..4a822c8 100644
--- a/test/samples/w3c/xpath/test402.scxml
+++ b/test/w3c/xpath/test402.scxml
diff --git a/test/samples/w3c/xpath/test403a.scxml b/test/w3c/xpath/test403a.scxml
index 98b885e..98b885e 100644
--- a/test/samples/w3c/xpath/test403a.scxml
+++ b/test/w3c/xpath/test403a.scxml
diff --git a/test/samples/w3c/xpath/test403b.scxml b/test/w3c/xpath/test403b.scxml
index 657e6c6..657e6c6 100644
--- a/test/samples/w3c/xpath/test403b.scxml
+++ b/test/w3c/xpath/test403b.scxml
diff --git a/test/samples/w3c/xpath/test403c.scxml b/test/w3c/xpath/test403c.scxml
index 4c7f154..4c7f154 100644
--- a/test/samples/w3c/xpath/test403c.scxml
+++ b/test/w3c/xpath/test403c.scxml
diff --git a/test/samples/w3c/xpath/test404.scxml b/test/w3c/xpath/test404.scxml
index f27c0ae..f27c0ae 100644
--- a/test/samples/w3c/xpath/test404.scxml
+++ b/test/w3c/xpath/test404.scxml
diff --git a/test/samples/w3c/xpath/test405.scxml b/test/w3c/xpath/test405.scxml
index 16e30ca..16e30ca 100644
--- a/test/samples/w3c/xpath/test405.scxml
+++ b/test/w3c/xpath/test405.scxml
diff --git a/test/samples/w3c/xpath/test406.scxml b/test/w3c/xpath/test406.scxml
index 3466313..3466313 100644
--- a/test/samples/w3c/xpath/test406.scxml
+++ b/test/w3c/xpath/test406.scxml
diff --git a/test/samples/w3c/xpath/test407.scxml b/test/w3c/xpath/test407.scxml
index c96630c..c96630c 100644
--- a/test/samples/w3c/xpath/test407.scxml
+++ b/test/w3c/xpath/test407.scxml
diff --git a/test/samples/w3c/xpath/test409.scxml b/test/w3c/xpath/test409.scxml
index 2d5a63d..2d5a63d 100644
--- a/test/samples/w3c/xpath/test409.scxml
+++ b/test/w3c/xpath/test409.scxml
diff --git a/test/samples/w3c/xpath/test411.scxml b/test/w3c/xpath/test411.scxml
index 60a8460..60a8460 100644
--- a/test/samples/w3c/xpath/test411.scxml
+++ b/test/w3c/xpath/test411.scxml
diff --git a/test/samples/w3c/xpath/test412.scxml b/test/w3c/xpath/test412.scxml
index 1895c9f..1895c9f 100644
--- a/test/samples/w3c/xpath/test412.scxml
+++ b/test/w3c/xpath/test412.scxml
diff --git a/test/samples/w3c/xpath/test413.scxml b/test/w3c/xpath/test413.scxml
index 819dfb5..819dfb5 100644
--- a/test/samples/w3c/xpath/test413.scxml
+++ b/test/w3c/xpath/test413.scxml
diff --git a/test/samples/w3c/xpath/test415.scxml b/test/w3c/xpath/test415.scxml
index 2da0bef..2da0bef 100644
--- a/test/samples/w3c/xpath/test415.scxml
+++ b/test/w3c/xpath/test415.scxml
diff --git a/test/samples/w3c/xpath/test416.scxml b/test/w3c/xpath/test416.scxml
index dfa60fe..dfa60fe 100644
--- a/test/samples/w3c/xpath/test416.scxml
+++ b/test/w3c/xpath/test416.scxml
diff --git a/test/samples/w3c/xpath/test417.scxml b/test/w3c/xpath/test417.scxml
index d8e5715..d8e5715 100644
--- a/test/samples/w3c/xpath/test417.scxml
+++ b/test/w3c/xpath/test417.scxml
diff --git a/test/samples/w3c/xpath/test419.scxml b/test/w3c/xpath/test419.scxml
index fade57d..fade57d 100644
--- a/test/samples/w3c/xpath/test419.scxml
+++ b/test/w3c/xpath/test419.scxml
diff --git a/test/samples/w3c/xpath/test421.scxml b/test/w3c/xpath/test421.scxml
index a73a11a..a73a11a 100644
--- a/test/samples/w3c/xpath/test421.scxml
+++ b/test/w3c/xpath/test421.scxml
diff --git a/test/samples/w3c/xpath/test422.scxml b/test/w3c/xpath/test422.scxml
index f62098d..f62098d 100644
--- a/test/samples/w3c/xpath/test422.scxml
+++ b/test/w3c/xpath/test422.scxml
diff --git a/test/samples/w3c/xpath/test423.scxml b/test/w3c/xpath/test423.scxml
index 7726963..7726963 100644
--- a/test/samples/w3c/xpath/test423.scxml
+++ b/test/w3c/xpath/test423.scxml
diff --git a/test/samples/w3c/ecma/test436.scxml b/test/w3c/xpath/test436.scxml
index d8b2ca2..d8b2ca2 100644
--- a/test/samples/w3c/ecma/test436.scxml
+++ b/test/w3c/xpath/test436.scxml
diff --git a/test/samples/w3c/ecma/test444.scxml b/test/w3c/xpath/test444.scxml
index c689674..c689674 100644
--- a/test/samples/w3c/ecma/test444.scxml
+++ b/test/w3c/xpath/test444.scxml
diff --git a/test/samples/w3c/ecma/test445.scxml b/test/w3c/xpath/test445.scxml
index f1ae24b..f1ae24b 100644
--- a/test/samples/w3c/ecma/test445.scxml
+++ b/test/w3c/xpath/test445.scxml
diff --git a/test/samples/w3c/ecma/test448.scxml b/test/w3c/xpath/test448.scxml
index adbc121..adbc121 100644
--- a/test/samples/w3c/ecma/test448.scxml
+++ b/test/w3c/xpath/test448.scxml
diff --git a/test/samples/w3c/ecma/test449.scxml b/test/w3c/xpath/test449.scxml
index d06cc9a..d06cc9a 100644
--- a/test/samples/w3c/ecma/test449.scxml
+++ b/test/w3c/xpath/test449.scxml
diff --git a/test/samples/w3c/ecma/test451.scxml b/test/w3c/xpath/test451.scxml
index e939ded..e939ded 100644
--- a/test/samples/w3c/ecma/test451.scxml
+++ b/test/w3c/xpath/test451.scxml
diff --git a/test/samples/w3c/ecma/test452.scxml b/test/w3c/xpath/test452.scxml
index 4f38ca7..4f38ca7 100644
--- a/test/samples/w3c/ecma/test452.scxml
+++ b/test/w3c/xpath/test452.scxml
diff --git a/test/samples/w3c/ecma/test453.scxml b/test/w3c/xpath/test453.scxml
index 33b904d..33b904d 100644
--- a/test/samples/w3c/ecma/test453.scxml
+++ b/test/w3c/xpath/test453.scxml
diff --git a/test/samples/w3c/xpath/test456.scxml b/test/w3c/xpath/test456.scxml
index 2aebab0..2aebab0 100644
--- a/test/samples/w3c/xpath/test456.scxml
+++ b/test/w3c/xpath/test456.scxml
diff --git a/test/samples/w3c/ecma/test457.scxml b/test/w3c/xpath/test457.scxml
index 86cf156..86cf156 100644
--- a/test/samples/w3c/ecma/test457.scxml
+++ b/test/w3c/xpath/test457.scxml
diff --git a/test/samples/w3c/ecma/test460.scxml b/test/w3c/xpath/test460.scxml
index 8ba3e5e..8ba3e5e 100644
--- a/test/samples/w3c/ecma/test460.scxml
+++ b/test/w3c/xpath/test460.scxml
diff --git a/test/samples/w3c/ecma/test463.scxml b/test/w3c/xpath/test463.scxml
index 4f32b84..4f32b84 100644
--- a/test/samples/w3c/ecma/test463.scxml
+++ b/test/w3c/xpath/test463.scxml
diff --git a/test/samples/w3c/ecma/test464.scxml b/test/w3c/xpath/test464.scxml
index bd640f2..bd640f2 100644
--- a/test/samples/w3c/ecma/test464.scxml
+++ b/test/w3c/xpath/test464.scxml
diff --git a/test/samples/w3c/ecma/test465.scxml b/test/w3c/xpath/test465.scxml
index a91bb06..a91bb06 100644
--- a/test/samples/w3c/ecma/test465.scxml
+++ b/test/w3c/xpath/test465.scxml
diff --git a/test/samples/w3c/ecma/test466.scxml b/test/w3c/xpath/test466.scxml
index 1431fab..1431fab 100644
--- a/test/samples/w3c/ecma/test466.scxml
+++ b/test/w3c/xpath/test466.scxml
diff --git a/test/samples/w3c/ecma/test467.scxml b/test/w3c/xpath/test467.scxml
index 130b7bc..130b7bc 100644
--- a/test/samples/w3c/ecma/test467.scxml
+++ b/test/w3c/xpath/test467.scxml
diff --git a/test/samples/w3c/ecma/test468.scxml b/test/w3c/xpath/test468.scxml
index 3b6902d..3b6902d 100644
--- a/test/samples/w3c/ecma/test468.scxml
+++ b/test/w3c/xpath/test468.scxml
diff --git a/test/samples/w3c/ecma/test469.scxml b/test/w3c/xpath/test469.scxml
index 02fe476..02fe476 100644
--- a/test/samples/w3c/ecma/test469.scxml
+++ b/test/w3c/xpath/test469.scxml
diff --git a/test/samples/w3c/ecma/test470.scxml b/test/w3c/xpath/test470.scxml
index 3c26bb1..3c26bb1 100644
--- a/test/samples/w3c/ecma/test470.scxml
+++ b/test/w3c/xpath/test470.scxml
diff --git a/test/samples/w3c/ecma/test473.scxml b/test/w3c/xpath/test473.scxml
index 4a57129..4a57129 100644
--- a/test/samples/w3c/ecma/test473.scxml
+++ b/test/w3c/xpath/test473.scxml
diff --git a/test/samples/w3c/ecma/test474.scxml b/test/w3c/xpath/test474.scxml
index decad75..decad75 100644
--- a/test/samples/w3c/ecma/test474.scxml
+++ b/test/w3c/xpath/test474.scxml
diff --git a/test/samples/w3c/ecma/test475.scxml b/test/w3c/xpath/test475.scxml
index 0f9cdfe..0f9cdfe 100644
--- a/test/samples/w3c/ecma/test475.scxml
+++ b/test/w3c/xpath/test475.scxml
diff --git a/test/samples/w3c/ecma/test476.scxml b/test/w3c/xpath/test476.scxml
index d3fe8e8..d3fe8e8 100644
--- a/test/samples/w3c/ecma/test476.scxml
+++ b/test/w3c/xpath/test476.scxml
diff --git a/test/samples/w3c/ecma/test477.scxml b/test/w3c/xpath/test477.scxml
index 1726866..1726866 100644
--- a/test/samples/w3c/ecma/test477.scxml
+++ b/test/w3c/xpath/test477.scxml
diff --git a/test/samples/w3c/ecma/test478.scxml b/test/w3c/xpath/test478.scxml
index 9821608..9821608 100644
--- a/test/samples/w3c/ecma/test478.scxml
+++ b/test/w3c/xpath/test478.scxml
diff --git a/test/samples/w3c/ecma/test479.scxml b/test/w3c/xpath/test479.scxml
index 3d5b1ac..3d5b1ac 100644
--- a/test/samples/w3c/ecma/test479.scxml
+++ b/test/w3c/xpath/test479.scxml
diff --git a/test/samples/w3c/ecma/test480.scxml b/test/w3c/xpath/test480.scxml
index 0fde260..0fde260 100644
--- a/test/samples/w3c/ecma/test480.scxml
+++ b/test/w3c/xpath/test480.scxml
diff --git a/test/samples/w3c/ecma/test481.scxml b/test/w3c/xpath/test481.scxml
index a0505f6..a0505f6 100644
--- a/test/samples/w3c/ecma/test481.scxml
+++ b/test/w3c/xpath/test481.scxml
diff --git a/test/samples/w3c/ecma/test482.scxml b/test/w3c/xpath/test482.scxml
index 00eb3fe..00eb3fe 100644
--- a/test/samples/w3c/ecma/test482.scxml
+++ b/test/w3c/xpath/test482.scxml
diff --git a/test/samples/w3c/ecma/test483.scxml b/test/w3c/xpath/test483.scxml
index 0a1b236..0a1b236 100644
--- a/test/samples/w3c/ecma/test483.scxml
+++ b/test/w3c/xpath/test483.scxml
diff --git a/test/samples/w3c/xpath/test487.scxml b/test/w3c/xpath/test487.scxml
index 9e6c441..9e6c441 100644
--- a/test/samples/w3c/xpath/test487.scxml
+++ b/test/w3c/xpath/test487.scxml
diff --git a/test/samples/w3c/xpath/test488.scxml b/test/w3c/xpath/test488.scxml
index 9da2e92..9da2e92 100644
--- a/test/samples/w3c/xpath/test488.scxml
+++ b/test/w3c/xpath/test488.scxml
diff --git a/test/samples/w3c/xpath/test495.scxml b/test/w3c/xpath/test495.scxml
index c244266..c244266 100644
--- a/test/samples/w3c/xpath/test495.scxml
+++ b/test/w3c/xpath/test495.scxml
diff --git a/test/samples/w3c/xpath/test500.scxml b/test/w3c/xpath/test500.scxml
index 51252eb..51252eb 100644
--- a/test/samples/w3c/xpath/test500.scxml
+++ b/test/w3c/xpath/test500.scxml
diff --git a/test/samples/w3c/xpath/test501.scxml b/test/w3c/xpath/test501.scxml
index 740f81b..740f81b 100644
--- a/test/samples/w3c/xpath/test501.scxml
+++ b/test/w3c/xpath/test501.scxml
diff --git a/test/samples/w3c/xpath/test503.scxml b/test/w3c/xpath/test503.scxml
index addd166..addd166 100644
--- a/test/samples/w3c/xpath/test503.scxml
+++ b/test/w3c/xpath/test503.scxml
diff --git a/test/samples/w3c/xpath/test504.scxml b/test/w3c/xpath/test504.scxml
index 08b7a2e..08b7a2e 100644
--- a/test/samples/w3c/xpath/test504.scxml
+++ b/test/w3c/xpath/test504.scxml
diff --git a/test/samples/w3c/xpath/test505.scxml b/test/w3c/xpath/test505.scxml
index 94575a1..94575a1 100644
--- a/test/samples/w3c/xpath/test505.scxml
+++ b/test/w3c/xpath/test505.scxml
diff --git a/test/samples/w3c/xpath/test506.scxml b/test/w3c/xpath/test506.scxml
index 4d0fbfb..4d0fbfb 100644
--- a/test/samples/w3c/xpath/test506.scxml
+++ b/test/w3c/xpath/test506.scxml
diff --git a/test/samples/w3c/xpath/test509.scxml b/test/w3c/xpath/test509.scxml
index 70e903f..70e903f 100644
--- a/test/samples/w3c/xpath/test509.scxml
+++ b/test/w3c/xpath/test509.scxml
diff --git a/test/samples/w3c/xpath/test510.scxml b/test/w3c/xpath/test510.scxml
index 11adc1c..11adc1c 100644
--- a/test/samples/w3c/xpath/test510.scxml
+++ b/test/w3c/xpath/test510.scxml
diff --git a/test/samples/w3c/xpath/test513.scxml b/test/w3c/xpath/test513.scxml
index bc29bb4..bc29bb4 100644
--- a/test/samples/w3c/xpath/test513.scxml
+++ b/test/w3c/xpath/test513.scxml
diff --git a/test/samples/w3c/xpath/test518.scxml b/test/w3c/xpath/test518.scxml
index c79aa5d..c79aa5d 100644
--- a/test/samples/w3c/xpath/test518.scxml
+++ b/test/w3c/xpath/test518.scxml
diff --git a/test/samples/w3c/xpath/test519.scxml b/test/w3c/xpath/test519.scxml
index 684098e..684098e 100644
--- a/test/samples/w3c/xpath/test519.scxml
+++ b/test/w3c/xpath/test519.scxml
diff --git a/test/samples/w3c/xpath/test520.scxml b/test/w3c/xpath/test520.scxml
index cb54284..cb54284 100644
--- a/test/samples/w3c/xpath/test520.scxml
+++ b/test/w3c/xpath/test520.scxml
diff --git a/test/samples/w3c/xpath/test521.scxml b/test/w3c/xpath/test521.scxml
index 4b958ea..4b958ea 100644
--- a/test/samples/w3c/xpath/test521.scxml
+++ b/test/w3c/xpath/test521.scxml
diff --git a/test/samples/w3c/xpath/test522.scxml b/test/w3c/xpath/test522.scxml
index a13966d..a13966d 100644
--- a/test/samples/w3c/xpath/test522.scxml
+++ b/test/w3c/xpath/test522.scxml
diff --git a/test/samples/w3c/xpath/test525.scxml b/test/w3c/xpath/test525.scxml
index a19e06e..a19e06e 100644
--- a/test/samples/w3c/xpath/test525.scxml
+++ b/test/w3c/xpath/test525.scxml
diff --git a/test/samples/w3c/xpath/test527.scxml b/test/w3c/xpath/test527.scxml
index a5c69f8..a5c69f8 100644
--- a/test/samples/w3c/xpath/test527.scxml
+++ b/test/w3c/xpath/test527.scxml
diff --git a/test/samples/w3c/xpath/test528.scxml b/test/w3c/xpath/test528.scxml
index f8f8416..f8f8416 100644
--- a/test/samples/w3c/xpath/test528.scxml
+++ b/test/w3c/xpath/test528.scxml
diff --git a/test/samples/w3c/xpath/test529.scxml b/test/w3c/xpath/test529.scxml
index 5a78529..5a78529 100644
--- a/test/samples/w3c/xpath/test529.scxml
+++ b/test/w3c/xpath/test529.scxml
diff --git a/test/samples/w3c/xpath/test530.scxml b/test/w3c/xpath/test530.scxml
index 083ff37..083ff37 100644
--- a/test/samples/w3c/xpath/test530.scxml
+++ b/test/w3c/xpath/test530.scxml
diff --git a/test/samples/w3c/xpath/test531.scxml b/test/w3c/xpath/test531.scxml
index 282e479..282e479 100644
--- a/test/samples/w3c/xpath/test531.scxml
+++ b/test/w3c/xpath/test531.scxml
diff --git a/test/samples/w3c/xpath/test532.scxml b/test/w3c/xpath/test532.scxml
index f883c66..f883c66 100644
--- a/test/samples/w3c/xpath/test532.scxml
+++ b/test/w3c/xpath/test532.scxml
diff --git a/test/samples/w3c/xpath/test533.scxml b/test/w3c/xpath/test533.scxml
index 06f090b..06f090b 100644
--- a/test/samples/w3c/xpath/test533.scxml
+++ b/test/w3c/xpath/test533.scxml
diff --git a/test/samples/w3c/xpath/test534.scxml b/test/w3c/xpath/test534.scxml
index 6dde647..6dde647 100644
--- a/test/samples/w3c/xpath/test534.scxml
+++ b/test/w3c/xpath/test534.scxml
diff --git a/test/samples/w3c/ecma/test537.scxml b/test/w3c/xpath/test537.scxml
index 350d422..350d422 100644
--- a/test/samples/w3c/ecma/test537.scxml
+++ b/test/w3c/xpath/test537.scxml
diff --git a/test/samples/w3c/ecma/test539.scxml b/test/w3c/xpath/test539.scxml
index 450bfd9..450bfd9 100644
--- a/test/samples/w3c/ecma/test539.scxml
+++ b/test/w3c/xpath/test539.scxml
diff --git a/test/samples/w3c/ecma/test539.txt b/test/w3c/xpath/test539.txt
index de1b0a1..de1b0a1 100644
--- a/test/samples/w3c/ecma/test539.txt
+++ b/test/w3c/xpath/test539.txt
diff --git a/test/samples/w3c/ecma/test540.scxml b/test/w3c/xpath/test540.scxml
index 641509f..641509f 100644
--- a/test/samples/w3c/ecma/test540.scxml
+++ b/test/w3c/xpath/test540.scxml
diff --git a/test/samples/w3c/ecma/test540.txt b/test/w3c/xpath/test540.txt
index 2191239..2191239 100644
--- a/test/samples/w3c/ecma/test540.txt
+++ b/test/w3c/xpath/test540.txt
diff --git a/test/samples/w3c/ecma/test542.scxml b/test/w3c/xpath/test542.scxml
index 1101471..1101471 100644
--- a/test/samples/w3c/ecma/test542.scxml
+++ b/test/w3c/xpath/test542.scxml
diff --git a/test/samples/w3c/ecma/test543.scxml b/test/w3c/xpath/test543.scxml
index 2c5c6de..2c5c6de 100644
--- a/test/samples/w3c/ecma/test543.scxml
+++ b/test/w3c/xpath/test543.scxml
diff --git a/test/samples/w3c/ecma/test544.scxml b/test/w3c/xpath/test544.scxml
index fd09502..fd09502 100644
--- a/test/samples/w3c/ecma/test544.scxml
+++ b/test/w3c/xpath/test544.scxml
diff --git a/test/samples/w3c/ecma/test546.scxml b/test/w3c/xpath/test546.scxml
index 728843b..728843b 100644
--- a/test/samples/w3c/ecma/test546.scxml
+++ b/test/w3c/xpath/test546.scxml
diff --git a/test/samples/w3c/ecma/test547.scxml b/test/w3c/xpath/test547.scxml
index 8c04c95..8c04c95 100644
--- a/test/samples/w3c/ecma/test547.scxml
+++ b/test/w3c/xpath/test547.scxml
diff --git a/test/samples/w3c/xpath/test550.scxml b/test/w3c/xpath/test550.scxml
index a08e67d..a08e67d 100644
--- a/test/samples/w3c/xpath/test550.scxml
+++ b/test/w3c/xpath/test550.scxml
diff --git a/test/samples/w3c/xpath/test551.scxml b/test/w3c/xpath/test551.scxml
index 756d326..756d326 100644
--- a/test/samples/w3c/xpath/test551.scxml
+++ b/test/w3c/xpath/test551.scxml
diff --git a/test/samples/w3c/xpath/test552.scxml b/test/w3c/xpath/test552.scxml
index 6795e08..6795e08 100644
--- a/test/samples/w3c/xpath/test552.scxml
+++ b/test/w3c/xpath/test552.scxml
diff --git a/test/samples/w3c/ecma/test552.txt b/test/w3c/xpath/test552.txt
index d8263ee..d8263ee 100644
--- a/test/samples/w3c/ecma/test552.txt
+++ b/test/w3c/xpath/test552.txt
diff --git a/test/samples/w3c/xpath/test553.scxml b/test/w3c/xpath/test553.scxml
index eb6f24b..eb6f24b 100644
--- a/test/samples/w3c/xpath/test553.scxml
+++ b/test/w3c/xpath/test553.scxml
diff --git a/test/samples/w3c/xpath/test554.scxml b/test/w3c/xpath/test554.scxml
index 64274aa..64274aa 100644
--- a/test/samples/w3c/xpath/test554.scxml
+++ b/test/w3c/xpath/test554.scxml
diff --git a/test/samples/w3c/ecma/test555.scxml b/test/w3c/xpath/test555.scxml
index 79dea75..79dea75 100644
--- a/test/samples/w3c/ecma/test555.scxml
+++ b/test/w3c/xpath/test555.scxml
diff --git a/test/samples/w3c/ecma/test557.scxml b/test/w3c/xpath/test557.scxml
index 6f4eed1..6f4eed1 100644
--- a/test/samples/w3c/ecma/test557.scxml
+++ b/test/w3c/xpath/test557.scxml
diff --git a/test/samples/w3c/ecma/test557.txt b/test/w3c/xpath/test557.txt
index a8e51da..a8e51da 100644
--- a/test/samples/w3c/ecma/test557.txt
+++ b/test/w3c/xpath/test557.txt
diff --git a/test/samples/w3c/ecma/test558.scxml b/test/w3c/xpath/test558.scxml
index a075100..a075100 100644
--- a/test/samples/w3c/ecma/test558.scxml
+++ b/test/w3c/xpath/test558.scxml
diff --git a/test/samples/w3c/ecma/test558.txt b/test/w3c/xpath/test558.txt
index bb2bcc7..bb2bcc7 100644
--- a/test/samples/w3c/ecma/test558.txt
+++ b/test/w3c/xpath/test558.txt
diff --git a/test/samples/w3c/ecma/test560.scxml b/test/w3c/xpath/test560.scxml
index d283b1a..d283b1a 100644
--- a/test/samples/w3c/ecma/test560.scxml
+++ b/test/w3c/xpath/test560.scxml
diff --git a/test/samples/w3c/ecma/test561.scxml b/test/w3c/xpath/test561.scxml
index e50e00c..e50e00c 100644
--- a/test/samples/w3c/ecma/test561.scxml
+++ b/test/w3c/xpath/test561.scxml
diff --git a/test/samples/w3c/ecma/test562.scxml b/test/w3c/xpath/test562.scxml
index f5997bb..f5997bb 100644
--- a/test/samples/w3c/ecma/test562.scxml
+++ b/test/w3c/xpath/test562.scxml
diff --git a/test/samples/w3c/xpath/test567.scxml b/test/w3c/xpath/test567.scxml
index 0aa4680..0aa4680 100644
--- a/test/samples/w3c/xpath/test567.scxml
+++ b/test/w3c/xpath/test567.scxml
diff --git a/test/samples/w3c/ecma/test568.scxml b/test/w3c/xpath/test568.scxml
index e8b888f..e8b888f 100644
--- a/test/samples/w3c/ecma/test568.scxml
+++ b/test/w3c/xpath/test568.scxml
diff --git a/test/samples/w3c/ecma/test569.scxml b/test/w3c/xpath/test569.scxml
index 832a0c0..832a0c0 100644
--- a/test/samples/w3c/ecma/test569.scxml
+++ b/test/w3c/xpath/test569.scxml
diff --git a/test/samples/w3c/xpath/test570.scxml b/test/w3c/xpath/test570.scxml
index 8caa2cd..8caa2cd 100644
--- a/test/samples/w3c/xpath/test570.scxml
+++ b/test/w3c/xpath/test570.scxml
diff --git a/test/samples/w3c/xpath/test576.scxml b/test/w3c/xpath/test576.scxml
index c5302f5..c5302f5 100644
--- a/test/samples/w3c/xpath/test576.scxml
+++ b/test/w3c/xpath/test576.scxml
diff --git a/test/samples/w3c/ecma/test578.scxml b/test/w3c/xpath/test578.scxml
index bdb5e2d..bdb5e2d 100644
--- a/test/samples/w3c/ecma/test578.scxml
+++ b/test/w3c/xpath/test578.scxml