Index: /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java
===================================================================
--- /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java	(revision 2005)
+++ /trunk/autoquest-plugin-uml-test/src/test/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtilsTest.java	(revision 2006)
@@ -41,6 +41,7 @@
 import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType;
 import de.ugoe.cs.autoquest.testgeneration.RandomWalkGenerator;
-import de.ugoe.cs.autoquest.usageprofiles.FirstOrderMarkovModel;
+import de.ugoe.cs.autoquest.usageprofiles.HighOrderMarkovModel;
 import de.ugoe.cs.autoquest.usageprofiles.IStochasticProcess;
+import de.ugoe.cs.autoquest.usageprofiles.TrieBasedModel;
 import de.ugoe.cs.util.SerializationUtils;
 import de.ugoe.cs.util.console.TextConsole;
@@ -274,5 +275,5 @@
         Properties properties = loadProperties(testdata);
         Collection<List<Event>> sequences = loadAndPreprocessUsageJournal(testdata, properties);
-        IStochasticProcess model = createUsageProfile(testdata, sequences);
+        IStochasticProcess model = createUsageProfile(testdata, properties, sequences);
         byte[] serialized = SerializationUtils.serialize(model);
         SerializationUtils.deserialize(serialized);
@@ -324,5 +325,5 @@
             ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
                 .getFile()));
-        IStochasticProcess usageProfile = createUsageProfile(testdata, sequences);
+        IStochasticProcess usageProfile = createUsageProfile(testdata, properties, sequences);
         Collection<List<Event>> generatedSequences =
             createRandomSequences(usageProfile, properties);
@@ -353,5 +354,5 @@
             ModelUtils.loadModel(new File(ClassLoader.getSystemResource(testdata.dslModelFile)
                 .getFile()));
-        IStochasticProcess usageProfile = createUsageProfile(testdata, sequences);
+        IStochasticProcess usageProfile = createUsageProfile(testdata, properties, sequences);
         Collection<List<Event>> generatedSequences =
             createRandomSequences(usageProfile, properties);
@@ -400,9 +401,9 @@
     }
 
-    private IStochasticProcess createUsageProfile(TestData testdata,
+    private IStochasticProcess createUsageProfile(TestData testdata, Properties properties,
                                                   Collection<List<Event>> sequences)
         throws Exception
     {
-        FirstOrderMarkovModel usageProfile = new FirstOrderMarkovModel(new Random(1));
+        TrieBasedModel usageProfile = new HighOrderMarkovModel(Integer.parseInt(properties.getProperty("usageprofile.markovorder", "1")), new Random(1));
         usageProfile.train(sequences);
         FileOutputStream fos = new FileOutputStream(OUTPUT_DIR + testdata.usageProfileFile);