diff --git a/run-tests.sh b/run-tests.sh
index 6529b7c..4a9afc5 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -28,7 +28,6 @@ for t in $(ls tests/*.test); do
     fi
     if [ -f "tests/$num-output.graphml" ]
     then
-	# TODO: think about xmldiff here
 	diff "$t.graphml" "tests/$num-output.graphml"
 	if [ $? != 0 ]
 	then
diff --git a/tests/06-two-statemachines.test-output.graphml b/tests/06-output.graphml
similarity index 100%
rename from tests/06-two-statemachines.test-output.graphml
rename to tests/06-output.graphml
diff --git a/tests/07-single-state.test-output.graphml b/tests/07-output.graphml
similarity index 100%
rename from tests/07-single-state.test-output.graphml
rename to tests/07-output.graphml
diff --git a/tests/08-state-hierarchy.test-output.graphml b/tests/08-output.graphml
similarity index 100%
rename from tests/08-state-hierarchy.test-output.graphml
rename to tests/08-output.graphml
diff --git a/tests/09-initial.cpp b/tests/09-initial.cpp
index 75c150a..5f35091 100644
--- a/tests/09-initial.cpp
+++ b/tests/09-initial.cpp
@@ -31,20 +31,18 @@ int main(int argc, char** argv)
 	Document d;
 
 	StateMachine* sm = d.new_state_machine("SM");
-
-	d.new_initial(sm);
+	State* parent = d.new_state(sm, "State");
 	try {
 		// check id uniqueness
-		d.new_initial(sm, "n0");
+		d.new_initial(sm, "n0", "init name");
 	} catch (const Cyberiada::ParametersException&){
 	}
+	d.new_initial(sm);
 	try {
 		// check non-empty name
 		d.new_initial(sm, "");
 	} catch (const Cyberiada::ParametersException&){
 	}
-	
-	State* parent = d.new_state(sm, "State");
 	d.new_initial(parent, "Local init");
 	try {
 		// check double initial
diff --git a/tests/09-initial.test-output.graphml b/tests/09-output.graphml
similarity index 96%
rename from tests/09-initial.test-output.graphml
rename to tests/09-output.graphml
index cbe73d6..ae4a518 100644
--- a/tests/09-initial.test-output.graphml
+++ b/tests/09-output.graphml
@@ -35,16 +35,16 @@ eventPropagation/ block
 </data>
     </node>
     <node id="n0">
-      <data key="dVertex">initial</data>
-    </node>
-    <node id="n1">
       <data key="dName">State</data>
-      <graph id="n1:" edgedefault="directed">
-        <node id="n1::n0">
+      <graph id="n0:" edgedefault="directed">
+        <node id="n0::n0">
           <data key="dVertex">initial</data>
           <data key="dName">Local init</data>
         </node>
       </graph>
     </node>
+    <node id="n1">
+      <data key="dVertex">initial</data>
+    </node>
   </graph>
 </graphml>
diff --git a/tests/09-output.txt b/tests/09-output.txt
index 77c4744..ee5979b 100644
--- a/tests/09-output.txt
+++ b/tests/09-output.txt
@@ -1 +1 @@
-Document: {id: '', name: '', format: 'Cyberiada-GraphML-1.0', meta: {standard version: '1.0', transition order: transition first, event propagation: block events}, elements: {State Machine: {id: 'G0', name: 'SM', elements: {Initial: {id: 'n0'}, Composite State: {id: 'n1', name: 'State', elements: {Initial: {id: 'n1::n0', name: 'Local init'}}}}}}
+Document: {id: '', name: '', format: 'Cyberiada-GraphML-1.0', meta: {standard version: '1.0', transition order: transition first, event propagation: block events}, elements: {State Machine: {id: 'G0', name: 'SM', elements: {Composite State: {id: 'n0', name: 'State', elements: {Initial: {id: 'n0::n0', name: 'Local init'}}}, Initial: {id: 'n1'}}}}
diff --git a/tests/10-final.test-output.graphml b/tests/10-output.graphml
similarity index 100%
rename from tests/10-final.test-output.graphml
rename to tests/10-output.graphml
diff --git a/tests/11-choice.test-output.graphml b/tests/11-output.graphml
similarity index 100%
rename from tests/11-choice.test-output.graphml
rename to tests/11-output.graphml
diff --git a/tests/12-state-actions.test-output.graphml b/tests/12-output.graphml
similarity index 97%
rename from tests/12-state-actions.test-output.graphml
rename to tests/12-output.graphml
index 671996d..60a3ae9 100644
--- a/tests/12-state-actions.test-output.graphml
+++ b/tests/12-output.graphml
@@ -47,7 +47,7 @@ exit();
           <data key="dData">EVENT [is_guard()]/
 action();
 
-EVENT [is_guard() &amp;&amp; is_second()]/
+EVENT(b) [is_guard() &amp;&amp; is_second()]/
 action1();
 action2();