Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java
===================================================================
--- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java	(revision 537)
+++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObservedTest.java	(revision 548)
@@ -6,4 +6,5 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.usageprofiles.MockTrieBasedModel;
+import de.ugoe.cs.quest.usageprofiles.mock.StringEventType;
 
 import java.util.LinkedHashSet;
@@ -26,9 +27,9 @@
 public class CoverageCalculatorObservedTest {
 	
-	Collection<List<? extends Event<?>>> sequencesObserved;
-	
-	Set<List<? extends Event<?>>> sequencesCovered;
-	Set<List<? extends Event<?>>> sequencesCovered2;
-	Set<List<? extends Event<?>>> sequencesNewPossible;
+	Collection<List<Event>> sequencesObserved;
+	
+	Set<List<Event>> sequencesCovered;
+	Set<List<Event>> sequencesCovered2;
+	Set<List<Event>> sequencesNewPossible;
 	
 	MockTrieBasedModel mockProcess;
@@ -257,46 +258,46 @@
 	@Before
 	public void setUp() throws Exception {
-		sequencesObserved = new LinkedList<List<? extends Event<?>>>();
-		List<Event<?>> sequence1 = new ArrayList<Event<?>>();
-		sequence1.add(new Event<String>("a"));
-		sequence1.add(new Event<String>("b"));
-		sequence1.add(new Event<String>("r"));
-		sequence1.add(new Event<String>("a"));
-		List<Event<?>> sequence2 = new ArrayList<Event<?>>();
-		sequence2.add(new Event<String>("c"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("d"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("b"));
-		sequence2.add(new Event<String>("r"));
-		sequence2.add(new Event<String>("a"));
+		sequencesObserved = new LinkedList<List<Event>>();
+		List<Event> sequence1 = new ArrayList<Event>();
+		sequence1.add(new Event(new StringEventType("a")));
+		sequence1.add(new Event(new StringEventType("b")));
+		sequence1.add(new Event(new StringEventType("r")));
+		sequence1.add(new Event(new StringEventType("a")));
+		List<Event> sequence2 = new ArrayList<Event>();
+		sequence2.add(new Event(new StringEventType("c")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("d")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("b")));
+		sequence2.add(new Event(new StringEventType("r")));
+		sequence2.add(new Event(new StringEventType("a")));
 		sequencesObserved.add(sequence1);
 		sequencesObserved.add(sequence2);
 
-		sequencesCovered = new LinkedHashSet<List<? extends Event<?>>>();
-		List<Event<?>> tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
+		sequencesCovered = new LinkedHashSet<List<Event>>();
+		List<Event> tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
 		sequencesCovered.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("e"));
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("e")));
 		sequencesCovered.add(tmpList);
 
-		sequencesCovered2 = new LinkedHashSet<List<? extends Event<?>>>();
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
+		sequencesCovered2 = new LinkedHashSet<List<Event>>();
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
 		sequencesCovered2.add(tmpList);
 		
-		sequencesNewPossible = new LinkedHashSet<List<? extends Event<?>>>();
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("r"));
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
+		sequencesNewPossible = new LinkedHashSet<List<Event>>();
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("r")));
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
 		sequencesNewPossible.add(tmpList);
 		
Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java
===================================================================
--- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java	(revision 537)
+++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcessTest.java	(revision 548)
@@ -12,4 +12,5 @@
 import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.usageprofiles.MockTrieBasedModel;
+import de.ugoe.cs.quest.usageprofiles.mock.StringEventType;
 
 import org.junit.*;
@@ -26,6 +27,6 @@
 public class CoverageCalculatorProcessTest {
 
-	Set<List<? extends Event<?>>> sequencesCovered;
-	Set<List<? extends Event<?>>> sequencesCovered2;
+	Set<List<Event>> sequencesCovered;
+	Set<List<Event>> sequencesCovered2;
 	MockTrieBasedModel mockProcess;
 
@@ -189,38 +190,38 @@
 	@Before
 	public void setUp() throws Exception {
-		Collection<List<? extends Event<?>>> sequences = new LinkedList<List<? extends Event<?>>>();
-		List<Event<?>> sequence1 = new ArrayList<Event<?>>();
-		sequence1.add(new Event<String>("a"));
-		sequence1.add(new Event<String>("b"));
-		sequence1.add(new Event<String>("r"));
-		sequence1.add(new Event<String>("a"));
-		List<Event<?>> sequence2 = new ArrayList<Event<?>>();
-		sequence2.add(new Event<String>("c"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("d"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("b"));
-		sequence2.add(new Event<String>("r"));
-		sequence2.add(new Event<String>("a"));
+		Collection<List<Event>> sequences = new LinkedList<List<Event>>();
+		List<Event> sequence1 = new ArrayList<Event>();
+		sequence1.add(new Event(new StringEventType("a")));
+		sequence1.add(new Event(new StringEventType("b")));
+		sequence1.add(new Event(new StringEventType("r")));
+		sequence1.add(new Event(new StringEventType("a")));
+		List<Event> sequence2 = new ArrayList<Event>();
+		sequence2.add(new Event(new StringEventType("c")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("d")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("b")));
+		sequence2.add(new Event(new StringEventType("r")));
+		sequence2.add(new Event(new StringEventType("a")));
 		sequences.add(sequence1);
 		sequences.add(sequence2);
 
-		sequencesCovered = new LinkedHashSet<List<? extends Event<?>>>();
-		List<Event<?>> tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
+		sequencesCovered = new LinkedHashSet<List<Event>>();
+		List<Event> tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
 		sequencesCovered.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
-		tmpList.add(new Event<String>("a"));
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
+		tmpList.add(new Event(new StringEventType("a")));
 		sequencesCovered.add(tmpList);
 
-		sequencesCovered2 = new LinkedHashSet<List<? extends Event<?>>>();
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
+		sequencesCovered2 = new LinkedHashSet<List<Event>>();
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
 		sequencesCovered2.add(tmpList);
 
Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java
===================================================================
--- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java	(revision 537)
+++ trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/SequenceToolsTest.java	(revision 548)
@@ -15,4 +15,5 @@
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
 import de.ugoe.cs.quest.usageprofiles.MockTrieBasedModel;
+import de.ugoe.cs.quest.usageprofiles.mock.StringEventType;
 
 import org.junit.*;
@@ -28,6 +29,6 @@
 public class SequenceToolsTest {
 	
-	Collection<List<? extends Event<?>>> sequences;
-	Set<List<? extends Event<?>>> subSequences;
+	Collection<List<Event>> sequences;
+	Set<List<Event>> subSequences;
 	MockTrieBasedModel mockProcess;
 	
@@ -37,5 +38,5 @@
 		int length = 2;
 
-		Set<List<? extends Event<?>>> result = SequenceTools.containedSubSequences(sequences, length);
+		Set<List<Event>> result = SequenceTools.containedSubSequences(sequences, length);
 
 		assertNotNull(result);
@@ -49,5 +50,5 @@
 		int length = 2;
 
-		Set<List<? extends Event<?>>> result = SequenceTools.containedSubSequences(null, length);
+		Set<List<Event>> result = SequenceTools.containedSubSequences(null, length);
 		assertNotNull(result);
 		assertTrue(result.isEmpty());
@@ -73,10 +74,10 @@
 	public void testGenerateWeights_1()
 		throws Exception {
-		Map<List<? extends Event<?>>, Double> result = SequenceTools.generateWeights(mockProcess, subSequences);
-
-		assertNotNull(result);
-		Set<Entry<List<? extends Event<?>>, Double>> entrySet = result.entrySet();
+		Map<List<Event>, Double> result = SequenceTools.generateWeights(mockProcess, subSequences);
+
+		assertNotNull(result);
+		Set<Entry<List<Event>, Double>> entrySet = result.entrySet();
 		assertEquals(subSequences.size(),entrySet.size());
-		for( Entry<List<? extends Event<?>>, Double> entry : entrySet ) {
+		for( Entry<List<Event>, Double> entry : entrySet ) {
 			assertEquals(Double.valueOf(2.0d), entry.getValue());
 			assertTrue(subSequences.contains(entry.getKey()));
@@ -87,9 +88,9 @@
 	public void testGenerateWeights_2()
 		throws Exception {
-		Map<List<? extends Event<?>>, Double> result = SequenceTools.generateWeights(null, subSequences);
-		
-		Set<Entry<List<? extends Event<?>>, Double>> entrySet = result.entrySet();
+		Map<List<Event>, Double> result = SequenceTools.generateWeights(null, subSequences);
+		
+		Set<Entry<List<Event>, Double>> entrySet = result.entrySet();
 		assertEquals(subSequences.size(),entrySet.size());
-		for( Entry<List<? extends Event<?>>, Double> entry : entrySet ) {
+		for( Entry<List<Event>, Double> entry : entrySet ) {
 			assertEquals(Double.valueOf(0.0d), entry.getValue());
 			assertTrue(subSequences.contains(entry.getKey()));
@@ -100,5 +101,5 @@
 	public void testGenerateWeights_3()
 		throws Exception {
-		Map<List<? extends Event<?>>, Double> result = SequenceTools.generateWeights(mockProcess, null);
+		Map<List<Event>, Double> result = SequenceTools.generateWeights(mockProcess, null);
 		
 		assertNotNull(result);
@@ -148,45 +149,45 @@
 	public void setUp()
 		throws Exception {
-		sequences = new LinkedList<List<? extends Event<?>>>();
-		List<Event<?>> sequence1 = new ArrayList<Event<?>>();
-		sequence1.add(new Event<String>("a"));
-		sequence1.add(new Event<String>("b"));
-		sequence1.add(new Event<String>("r"));
-		sequence1.add(new Event<String>("a"));
-		List<Event<?>> sequence2 = new ArrayList<Event<?>>();
-		sequence2.add(new Event<String>("c"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("d"));
-		sequence2.add(new Event<String>("a"));
-		sequence2.add(new Event<String>("b"));
-		sequence2.add(new Event<String>("r"));
-		sequence2.add(new Event<String>("a"));
+		sequences = new LinkedList<List<Event>>();
+		List<Event> sequence1 = new ArrayList<Event>();
+		sequence1.add(new Event(new StringEventType("a")));
+		sequence1.add(new Event(new StringEventType("b")));
+		sequence1.add(new Event(new StringEventType("r")));
+		sequence1.add(new Event(new StringEventType("a")));
+		List<Event> sequence2 = new ArrayList<Event>();
+		sequence2.add(new Event(new StringEventType("c")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("d")));
+		sequence2.add(new Event(new StringEventType("a")));
+		sequence2.add(new Event(new StringEventType("b")));
+		sequence2.add(new Event(new StringEventType("r")));
+		sequence2.add(new Event(new StringEventType("a")));
 		sequences.add(sequence1);
 		sequences.add(sequence2);
 		
-		subSequences = new LinkedHashSet<List<? extends Event<?>>>();
-		List<Event<?>> tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("b"));
-		subSequences.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("b"));
-		tmpList.add(new Event<String>("r"));
-		subSequences.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("r"));
-		tmpList.add(new Event<String>("a"));
-		subSequences.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("c"));
-		tmpList.add(new Event<String>("a"));
-		subSequences.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("a"));
-		tmpList.add(new Event<String>("d"));
-		subSequences.add(tmpList);
-		tmpList = new ArrayList<Event<?>>();
-		tmpList.add(new Event<String>("d"));
-		tmpList.add(new Event<String>("a"));
+		subSequences = new LinkedHashSet<List<Event>>();
+		List<Event> tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("b")));
+		subSequences.add(tmpList);
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("b")));
+		tmpList.add(new Event(new StringEventType("r")));
+		subSequences.add(tmpList);
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("r")));
+		tmpList.add(new Event(new StringEventType("a")));
+		subSequences.add(tmpList);
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("c")));
+		tmpList.add(new Event(new StringEventType("a")));
+		subSequences.add(tmpList);
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("a")));
+		tmpList.add(new Event(new StringEventType("d")));
+		subSequences.add(tmpList);
+		tmpList = new ArrayList<Event>();
+		tmpList.add(new Event(new StringEventType("d")));
+		tmpList.add(new Event(new StringEventType("a")));
 		subSequences.add(tmpList);
 		
Index: trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/TestAll.java
===================================================================
--- trunk/quest-core-coverage-test/src/test/java/de/ugoe/cs/quest/coverage/TestAll.java	(revision 537)
+++ 	(revision )
@@ -1,26 +1,0 @@
-package de.ugoe.cs.quest.coverage;
-
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * The class <code>TestAll</code> builds a suite that can be used to run all
- * of the tests within its package as well as within any subpackages of its
- * package.
- *
- * @author Steffen Herbold
- * @version 1.0
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	CoverageCalculatorObservedTest.class,
-	CoverageCalculatorProcessTest.class,
-	SequenceToolsTest.class
-})
-public class TestAll {
-
-	public static void main(String[] args) {
-		JUnitCore.runClasses(new Class[] { TestAll.class });
-	}
-}