Index: trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/SOAPUtilsTest.java
===================================================================
--- trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/SOAPUtilsTest.java	(revision 1987)
+++ trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/SOAPUtilsTest.java	(revision 1988)
@@ -46,34 +46,38 @@
         parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
             .getFile()));
-        Collection<List<Event>> events = parser.getSequences();
+        Collection<List<Event>> sequences = parser.getSequences();
 
-        assertNotNull(events);
-        assertEquals(1, events.size());
+        assertNotNull(sequences);
+        assertFalse(sequences.isEmpty());
 
-        List<Event> sequence = events.iterator().next();
+        Collection<List<Event>> newSequences = SOAPUtils.convertToSimpleSOAPEvent(sequences, false);
+        
+        assertNotNull(newSequences);
+        assertEquals(sequences.size(), newSequences.size());
 
-        List<Event> newSequence = SOAPUtils.convertToSimpleSOAPEvent(sequence, false);
-
-        assertNotNull(newSequence);
-        assertEquals(sequence.size(), newSequence.size());
-
-        Iterator<Event> oldSeqIter = sequence.iterator();
-        Iterator<Event> newSeqIter = newSequence.iterator();
-
-        while (oldSeqIter.hasNext()) {
-            Event oldEvent = oldSeqIter.next();
-            Event newEvent = newSeqIter.next();
-
-            if (oldEvent.getType() instanceof SOAPEventType) {
-                assertTrue(newEvent.getType() instanceof SimpleSOAPEventType);
-                SOAPEventType oldEventType = (SOAPEventType) oldEvent.getType();
-                SimpleSOAPEventType newEventType = (SimpleSOAPEventType) newEvent.getType();
-                assertEquals(oldEventType.getCalledMethod(), newEventType.getCalledMethod());
-                assertEquals(oldEventType.getServiceName(), newEventType.getServiceName());
-                assertEquals(oldEventType.getClientName(), newEventType.getClientName());
-                assertNull(newEvent.getTarget());
-            }
-            else {
-                assertSame(oldEvent, newEvent);
+        // compare sequences
+        Iterator<List<Event>> oldIter = sequences.iterator();
+        Iterator<List<Event>> newIter = newSequences.iterator();
+        
+        while( oldIter.hasNext() ) {
+            Iterator<Event> oldSeqIter = oldIter.next().iterator();
+            Iterator<Event> newSeqIter = newIter.next().iterator();
+    
+            while (oldSeqIter.hasNext()) {
+                Event oldEvent = oldSeqIter.next();
+                Event newEvent = newSeqIter.next();
+    
+                if (oldEvent.getType() instanceof SOAPEventType) {
+                    assertTrue(newEvent.getType() instanceof SimpleSOAPEventType);
+                    SOAPEventType oldEventType = (SOAPEventType) oldEvent.getType();
+                    SimpleSOAPEventType newEventType = (SimpleSOAPEventType) newEvent.getType();
+                    assertEquals(oldEventType.getCalledMethod(), newEventType.getCalledMethod());
+                    assertEquals(oldEventType.getServiceName(), newEventType.getServiceName());
+                    assertEquals(oldEventType.getClientName(), newEventType.getClientName());
+                    assertNull(newEvent.getTarget());
+                }
+                else {
+                    assertSame(oldEvent, newEvent);
+                }
             }
         }
Index: trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/EqualSOAPDataMapTest.java
===================================================================
--- trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/eventcore/EqualSOAPDataMapTest.java	(revision 1987)
+++ 	(revision )
@@ -1,89 +1,0 @@
-//   Copyright 2012 Georg-August-Universität Göttingen, Germany
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-
-package de.ugoe.cs.autoquest.http.eventcore;
-
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections4.set.ListOrderedSet;
-import org.junit.Test;
-
-import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
-import de.ugoe.cs.autoquest.plugin.http.SOAPUtils;
-import de.ugoe.cs.autoquest.plugin.http.eventcore.EqualSOAPDataMap;
-import de.ugoe.cs.autoquest.plugin.http.eventcore.SimpleSOAPEventType;
-
-/**
- * @author Steffen Herbold
- */
-public class EqualSOAPDataMapTest {
-
-    /**
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testSerialization_1() throws Exception {
-        HTTPLogParser parser =
-            new HTTPLogParser(new File(ClassLoader
-                .getSystemResource("testParseFile_3_properties.txt").getFile()));
-        parser.parseFile(new File(ClassLoader.getSystemResource("testParseFile_3_logfile.log")
-            .getFile()));
-        for (List<Event> sequence : parser.getSequences()) {
-            SOAPUtils.convertToSimpleSOAPEvent(sequence, true);
-        }
-
-        Field privateStringField = EqualSOAPDataMap.class.getDeclaredField("soapRequestBodies");
-
-        privateStringField.setAccessible(true);
-
-        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapExpected =
-            (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField
-                .get(EqualSOAPDataMap.getInstance());
-
-        // serialize
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(out);
-        oos.writeObject(EqualSOAPDataMap.getInstance());
-        oos.close();
-
-        EqualSOAPDataMap.getInstance().reset();
-
-        // deserialize
-        byte[] pickled = out.toByteArray();
-        InputStream in = new ByteArrayInputStream(pickled);
-        ObjectInputStream ois = new ObjectInputStream(in);
-        ois.readObject();
-        ois.close();
-
-        Map<SimpleSOAPEventType, ListOrderedSet<String>> internalMapResult =
-            (Map<SimpleSOAPEventType, ListOrderedSet<String>>) privateStringField
-                .get(EqualSOAPDataMap.getInstance());
-
-        assertNotSame(internalMapExpected, internalMapResult);
-        assertEquals(internalMapExpected, internalMapResult);
-    }
-
-}