Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomatonTest.java	(revision 766)
@@ -36,5 +36,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testDeterministicFiniteAutomaton_2() throws Exception {
 		new DeterministicFiniteAutomaton(null);
@@ -106,5 +106,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGetProbability_5() throws Exception {
 		DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton(
@@ -120,5 +120,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGetProbability_6() throws Exception {
 		DeterministicFiniteAutomaton fixture = new DeterministicFiniteAutomaton(
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModelTest.java	(revision 766)
@@ -35,5 +35,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testFirstOrderMarkovModel_2() throws Exception {
 		new FirstOrderMarkovModel(null);
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModelTest.java	(revision 766)
@@ -49,5 +49,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testHighOrderMarkovModel_3() throws Exception {
 		int maxOrder = 1;
@@ -57,5 +57,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testHighOrderMarkovModel_4() throws Exception {
 		int maxOrder = -1;
@@ -188,5 +188,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGetProbability_8() throws Exception {
 		int markovOrder = 0;
@@ -204,5 +204,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGetProbability_9() throws Exception {
 		int markovOrder = 0;
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/IncompleteMemoryTest.java	(revision 766)
@@ -27,5 +27,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testIncompleteMemory_2()
 		throws Exception {
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatchTest.java	(revision 766)
@@ -40,5 +40,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_2() throws Exception {
 		int markovOrder = -1;
@@ -48,5 +48,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_3() throws Exception {
 		int markovOrder = 2;
@@ -72,5 +72,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_5() throws Exception {
 		int markovOrder = -1;
@@ -81,5 +81,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_6() throws Exception {
 		int markovOrder = 2;
@@ -90,5 +90,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_7() throws Exception {
 		int markovOrder = 2;
@@ -99,5 +99,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_8() throws Exception {
 		int markovOrder = 2;
@@ -125,5 +125,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_10() throws Exception {
 		int markovOrder = -1;
@@ -135,5 +135,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_11() throws Exception {
 		int markovOrder = 2;
@@ -145,5 +145,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_12() throws Exception {
 		int markovOrder = 2;
@@ -155,5 +155,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_13() throws Exception {
 		int markovOrder = 2;
@@ -165,5 +165,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_14() throws Exception {
 		int markovOrder = 2;
@@ -175,5 +175,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testPredictionByPartialMatch_15() throws Exception {
 		int markovOrder = 2;
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModelTest.java	(revision 766)
@@ -267,5 +267,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testTrieBasedModel_2() throws Exception {
 		int markovOrder = -1;
@@ -275,5 +275,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testTrieBasedModel_3() throws Exception {
 		int markovOrder = 2;
@@ -377,5 +377,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGenerateSequences_3() throws Exception {
 		int markovOrder = 2;
@@ -423,5 +423,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGenerateValidSequences_2() throws Exception {
 		int markovOrder = 2;
@@ -570,5 +570,5 @@
 	}
 	
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testTrain_3() throws Exception {
 		int markovOrder = 2;
@@ -595,5 +595,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testUpdate_2() throws Exception {
 		int markovOrder = 2;
Index: trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java
===================================================================
--- trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java	(revision 762)
+++ trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/TrieTest.java	(revision 766)
@@ -59,5 +59,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testTrie_3() throws Exception {
 		new Trie<String>(null);
@@ -159,5 +159,5 @@
 	}
 
-	@Test(expected = java.security.InvalidParameterException.class)
+	@Test(expected = java.lang.IllegalArgumentException.class)
 	public void testGetChildCreate_2() throws Exception {
 		Trie<String> fixture = new Trie<String>();