Index: trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java
===================================================================
--- trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java	(revision 1172)
+++ trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitTextInputsEvaluatorTest.java	(revision 1201)
@@ -43,6 +43,8 @@
     public void should_return_no_recommendation() {
         // Given
-        String spec = "Sequence {" + 
-                      "  TextInput () {}" + 
+        String spec = "UserSession {" +
+        		      "  Sequence seq1 {" + 
+                      "    TextInput t1 {}" + 
+                      "  }" +
                       "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
@@ -56,9 +58,10 @@
     public void should_return_recommendation_with_info_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + 
-            "  TextInput (1234567890123456789012345678901234567890123456789_01234567890" + 
-                         "12345678901234567890123456789012345) {}" + 
-            "}";
+        String spec = "UserSession {" +
+                      "  Sequence seq1 {" + 
+                      "    TextInput t1 (1234567890123456789012345678901234567890123456789_01234567890" + 
+                      "                  12345678901234567890123456789012345) {ggdgdg11}" + 
+                      "  }" +
+                      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -71,8 +74,9 @@
     public void should_return_recommendation_with_low_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + 
-            "  TextInput (123456789012345678901234567890_123456789012345) {}" + 
-            "}";
+        String spec = "UserSession {" +
+                      "  Sequence seq1 {" + 
+                      "    TextInput t1 (123456789012345678901234567890_123456789012345) {}" + 
+                      "  }" +
+                      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -85,6 +89,8 @@
     public void should_return_recommendation_with_medium_severity_level() {
         // Given
-        String spec = "Sequence {" + 
-                      "  TextInput (12345_6789012345) {}" + 
+        String spec = "UserSession {" +
+        		      "  Sequence seq1 {" + 
+                      "    TextInput t1 (12345_6789012345) {}" + 
+                      "  }" +
                       "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
@@ -98,6 +104,8 @@
     public void should_return_recommendation_with_high_severity_level() {
         // Given
-        String spec = "Sequence {" +
-                      "  TextInput (_a_b_c_) {}" +
+        String spec = "UserSession {" +
+        		      "  Sequence seq1 {" +
+                      "    TextInput t1 (_a_b_c_) {}" +
+                      "  }" +
                       "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
Index: trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java
===================================================================
--- trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java	(revision 1172)
+++ trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsEvaluatorTest.java	(revision 1201)
@@ -43,5 +43,9 @@
     public void should_return_no_recommendation() {
         // Given
-        String spec = "Sequence {" + "  TextInput () {}" + "}";
+        String spec = "UserSession {" +
+        		      "  Sequence seq1 {" + 
+        		      "    TextInput t1 () {}" + 
+        		      "  }" +
+        		      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -54,7 +58,14 @@
     public void should_return_recommendation_with_info_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  TextInput (a b c) {}" + "  Sequence {" + "    TextInput (a) {}"
-                + "    TextInput (d) {}" + "    TextInput (e) {}" + "  }" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence seq1 {" + 
+        		      "    TextInput t1 (a b c) {}" +
+        			  "    Sequence seq2 {" + 
+        		      "      TextInput t2 (a) {}" + 
+        			  "      TextInput t3 (d) {}" + 
+        		      "      TextInput t4 (e) {}" + 
+        			  "    }" +
+        			  "  }" + 
+        		      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -67,7 +78,14 @@
     public void should_return_recommendation_with_low_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  TextInput (a b c) {}" + "  Sequence {" + "    TextInput (a) {}"
-                + "    TextInput (b) {}" + "    TextInput (c) {}" + "  }" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence seq1 {" + 
+        			  "    TextInput t1 (a b c) {}" + 
+        			  "    Sequence seq3 {" + 
+        			  "      TextInput t2 (a) {}" + 
+        			  "      TextInput t3 (b) {}" + 
+        			  "      TextInput t4 (c) {}" + 
+        			  "    }" +
+        			  "  }" + 
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -80,13 +98,41 @@
     public void should_return_recommendation_with_medium_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  TextInput (a b c d e f g h i j k l m) {}" + "  Sequence {"
-                + "    TextInput (a) {}" + "    TextInput (b) {}" + "    TextInput (c) {}"
-                + "    TextInput (d) {}" + "  }" + "  Iteration {" + "    TextInput (e) {}" + "  }"
-                + "  TextInput (a) {}" + "  Selection {" + "    TextInput (b) {}"
-                + "    TextInput (c) {}" + "    TextInput (d) {}" + "    TextInput (e) {}" + "  }"
-                + "  Sequence {" + "    TextInput (a) {}" + "    Sequence {"
-                + "      TextInput (b) {}" + "      TextInput (c) {}" + "      TextInput (d) {}"
-                + "      TextInput (e) {}" + "    }" + "  }" + "  TextInput (f) {}" + "}";
+        String spec = "UserSession {" +
+        		      "  Sequence seq1 {" + 
+        			  "    TextInput t1 (a b c d e f g h i j k l m) {}" + 
+        		      "    Sequence seq2 {" + 
+        			  "      TextInput t2 (a) {}" + 
+        		      "      TextInput t3 (b) {}" + 
+        			  "      TextInput t4 (c) {}" + 
+        		      "      TextInput t5 (d) {}" + 
+        			  "    }" + 
+        		      "    Iteration iter1 {" + 
+        			  "      TextInput t6 (e) {}" + 
+        		      "    }" + 
+        			  "    TextInput t7 (a) {}" + 
+        		      "    Selection sel1 {" + 
+        			  "      TextInput t8 (b) {}" +
+        			  "    }" +
+        		      "    Selection sel1 {" + 
+        			  "      TextInput t8 (c) {}" +
+        			  "    }" +
+        		      "    Selection sel1 {" + 
+        			  "      TextInput t8 (d) {}" +
+        			  "    }" +
+        		      "    Selection sel1 {" + 
+        			  "      TextInput t8 (e) {}" +
+        			  "    }" +
+        		      "    Sequence seq3 {" + 
+        			  "      TextInput t9 (a) {}" + 
+        		      "      Sequence seq4 {" + 
+        			  "        TextInput t10 (b) {}" + 
+        		      "        TextInput t11 (c) {}" + 
+        			  "        TextInput t12 (d) {}" + 
+        		      "        TextInput t13 (e) {}" + 
+        			  "      }" + 
+        		      "    }" + 
+        			  "    TextInput t14 (a) {}" +
+        			  "  }" + 
+        		      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -99,13 +145,41 @@
     public void should_return_recommendation_with_high_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  TextInput (a b c) {}" + "  Sequence {" + "    TextInput (a) {}"
-                + "    TextInput (b) {}" + "    TextInput (c) {}" + "    TextInput (a) {}" + "  }"
-                + "  Iteration {" + "    TextInput (a) {}" + "  }" + "  TextInput (a) {}"
-                + "  Selection {" + "    TextInput (b c) {}" + "    TextInput (a) {}"
-                + "    TextInput (a c) {}" + "    TextInput (b a) {}" + "  }" + "  Sequence {"
-                + "    TextInput (b c) {}" + "    Sequence {" + "      TextInput (d a c) {}"
-                + "      TextInput (b b b a) {}" + "      TextInput (a a c c) {}"
-                + "      TextInput (b b a) {}" + "    }" + "  }" + "  TextInput (d) {}" + "}";
+        String spec = "UserSession {" +
+		  		      "  Sequence seq1 {" + 
+		  			  "    TextInput t1 (a b c) {}" + 
+		  		      "    Sequence seq2 {" + 
+		  			  "      TextInput t2 (a) {}" + 
+		  		      "      TextInput t3 (b) {}" + 
+		  			  "      TextInput t4 (c) {}" + 
+		  		      "      TextInput t5 (a) {}" + 
+		  			  "    }" + 
+		  		      "    Iteration iter1 {" + 
+		  			  "      TextInput t6 (a) {}" + 
+		  		      "    }" + 
+		  			  "    TextInput t7 (a) {}" + 
+		  		      "    Selection sel1 {" + 
+		  			  "      TextInput t8 (b c) {}" +
+		  			  "    }" +
+		  		      "    Selection sel1 {" + 
+		  			  "      TextInput t8 (a) {}" +
+		  			  "    }" +
+		  		      "    Selection sel1 {" + 
+		  			  "      TextInput t8 (a c) {}" +
+		  			  "    }" +
+		  		      "    Selection sel1 {" + 
+		  			  "      TextInput t8 (b a) {}" +
+		  			  "    }" +
+		  		      "    Sequence seq3 {" + 
+		  			  "      TextInput t9 (b c) {}" + 
+		  		      "      Sequence seq4 {" + 
+		  			  "        TextInput t10 (d a c) {}" + 
+		  		      "        TextInput t11 (b b b a) {}" + 
+		  			  "        TextInput t12 (a a c c) {}" + 
+		  		      "        TextInput t13 (b b a) {}" + 
+		  			  "      }" + 
+		  		      "    }" + 
+		  			  "    TextInput t14 (a) {}" +
+		  			  "  }" + 
+		  		      "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
Index: trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioEvaluatorTest.java
===================================================================
--- trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioEvaluatorTest.java	(revision 1172)
+++ trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioEvaluatorTest.java	(revision 1201)
@@ -43,8 +43,16 @@
     public void should_return_no_recommendation() {
         // Given
-        String spec =
-            "Sequence {" + "  Interaction {}" + "  TextInput (a) {}" + "  Interaction {}"
-                + "  Interaction {}" + "  TextInput (c) {}" + "  Interaction {}"
-                + "  Interaction {}" + "  Interaction {}" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence seq1 {" + 
+        			  "    Interaction iter1 {}" + 
+        			  "    TextInput t1 (a) {}" + 
+        			  "    Interaction iter1 {}" + 
+        			  "    Interaction t2 {}" + 
+        			  "    TextInput t3 (c) {}" + 
+        			  "    Interaction t4 {}" + 
+        			  "    Interaction t5 {}" + 
+        			  "    Interaction t6 {}" + 
+        			  "  }" +
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -57,7 +65,13 @@
     public void should_return_recommendation_with_info_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  Interaction {}" + "  TextInput (a) {}" + "  Interaction {}"
-                + "  Interaction {}" + "  TextInput (c) {}" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence se1 {" + 
+        			  "    Interaction t1 {}" + 
+        			  "    TextInput t2 (a) {}" + 
+        			  "    Interaction t3 {}" + 
+        			  "    Interaction t4 {}" + 
+        			  "    TextInput t5 (c) {}" +
+        			  "  }" + 
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -70,7 +84,13 @@
     public void should_return_recommendation_with_low_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  Interaction {}" + "  TextInput (a) {}" + "  TextInput (b) {}"
-                + "  Interaction {}" + "  TextInput (c) {}" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence seq1 {" + 
+        			  "    Interaction t1 {}" + 
+        			  "    TextInput t2 (a) {}" + 
+        			  "    TextInput t3 (b) {}" + 
+        			  "    Interaction t4 {}" + 
+        			  "    TextInput t5 (c) {}" + 
+        			  "  }" +
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -83,7 +103,12 @@
     public void should_return_recommendation_with_medium_severity_level() {
         // Given
-        String spec =
-            "Sequence {" + "  TextInput (a) {}" + "  TextInput (b) {}" + "  Interaction {}"
-                + "  TextInput (c) {}" + "}";
+        String spec = "UserSession {" +
+        			  "  Sequence seq1 {" + 
+        			  "    TextInput t1 (a) {}" + 
+        			  "    TextInput t2 (b) {}" + 
+        			  "    Interaction t3 {}" + 
+        			  "    TextInput t4 (c) {}" + 
+        			  "  }" +
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When
@@ -96,5 +121,7 @@
     public void should_return_recommendation_with_high_severity_level() {
         // Given
-        String spec = "TextInput (bla) {}";
+        String spec = "UserSession {" +
+        			  "  TextInput t1 (bla) {}" +
+        			  "}";
         ITaskModel taskTree = GenerateTaskModelUtil.getTaskModelFromSpec(spec);
         // When