Index: src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java	(working copy)
@@ -1,115 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation.             *
- * All rights reserved.                                                *
- * ------------------------------------------------------------------- *
- * 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 org.apache.vysper.xmpp.protocol;
-
-import junit.framework.TestCase;
-import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
-import org.apache.vysper.xmpp.server.TestSessionContext;
-import org.apache.vysper.xmpp.server.XMPPVersion;
-import org.apache.vysper.xmpp.server.SessionState;
-import org.apache.vysper.xmpp.server.response.ServerResponses;
-import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
-import org.apache.vysper.xmpp.modules.core.base.BaseStreamStanzaDictionary;
-import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
-import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
-
-/**
- */
-public abstract class ProtocolStateTestCase extends TestCase {
-    protected ProtocolWorker protocolWorker;
-    protected DefaultServerRuntimeContext serverRuntimeContext;
-    protected TestSessionContext sessionContext;
-    protected static Entity serverEnitity = new EntityImpl(null, "vysper-server.org", null);
-    protected EntityImpl testFrom  = new EntityImpl("testuser", "vysper.org", null);
-    protected SessionStateHolder sessionStateHolder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        protocolWorker = new ProtocolWorker();
-        StanzaReceiverRelay receiverRelay = new StanzaReceiverRelay();
-        serverRuntimeContext = new DefaultServerRuntimeContext(serverEnitity, receiverRelay);
-        receiverRelay.setServerRuntimeContext(serverRuntimeContext);
-        serverRuntimeContext.addDictionary(new BaseStreamStanzaDictionary());
-        sessionStateHolder = new SessionStateHolder();
-        sessionContext = new TestSessionContext(serverRuntimeContext, sessionStateHolder);
-        sessionContext.setSessionState(getDefaultState());
-    }
-
-    protected void checkLanguage(String xmlLang) {
-        Stanza stanza;
-        Stanza recordedResponse;
-        XMLElementVerifier responseVerifier;
-        stanza = new ServerResponses().getStreamOpener(true, testFrom, xmlLang, XMPPVersion.VERSION_1_0, null).getFinalStanza();
-        protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
-
-        recordedResponse = sessionContext.getNextRecordedResponse();
-        responseVerifier = recordedResponse.getVerifier();
-        if (xmlLang == null) {
-            assertFalse(responseVerifier.attributePresent("xml:lang"));
-        } else {
-            assertTrue(responseVerifier.attributeEquals("xml:lang", xmlLang));
-        }
-    }
-
-    protected abstract SessionState getDefaultState();
-
-    /**
-     * call from a test method in subclass
-     */
-    protected void skeleton_testDontAcceptIQStanzaWhileNotAuthenticated() {
-        StanzaBuilder stanzaBuilder = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT);
-        stanzaBuilder.addAttribute("id", "1");
-        stanzaBuilder.addAttribute("type", "get");
-
-        protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
-
-        Stanza response = sessionContext.getNextRecordedResponse();
-        XMLElementVerifier responseVerifier = response.getVerifier();
-        assertTrue(responseVerifier.nameEquals("error"));
-        assertTrue("error", responseVerifier.subElementPresent(StreamErrorCondition.NOT_AUTHORIZED.value()));
-        assertTrue(sessionContext.isClosed());
-    }
-
-
-    /**
-     * call from a test method in subclass
-     */
-    protected void skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated() {
-        StanzaBuilder stanzaBuilder = new StanzaBuilder("arbitrary", NamespaceURIs.JABBER_CLIENT);
-        stanzaBuilder.addAttribute("id", "1");
-        stanzaBuilder.addAttribute("type", "get");
-
-        protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
-
-        Stanza response = sessionContext.getNextRecordedResponse();
-        
-        XMLElementVerifier responseVerifier = response.getVerifier();
-        // error might be wrapped within a stream opener
-        if (responseVerifier.nameEquals("stream")) {
-            responseVerifier = response.getFirstInnerElement().getVerifier();
-        }
-        
-        assertTrue(responseVerifier.nameEquals("error"));
-        assertTrue("error", responseVerifier.subElementPresent(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE.value()));
-        assertTrue(sessionContext.isClosed());
-    }
-}
Index: src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java	(working copy)
@@ -22,7 +22,7 @@
 /**
  * test bevahior for "STARTED" session state
  */
-public class ProtocolStartedTestCase extends ProtocolStateTestCase {
+public class ProtocolStartedTestCase extends AbstractProtocolStateTestCase {
 
     @Override
     protected SessionState getDefaultState() {
Index: src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java	(working copy)
@@ -22,7 +22,7 @@
 /**
  * test bevahior for "ENCRYPTION_STARTED" session state
  */
-public class ProtocolEncryptionStartedTestCase extends ProtocolStateTestCase {
+public class ProtocolEncryptionStartedTestCase extends AbstractProtocolStateTestCase {
 
     @Override
     protected SessionState getDefaultState() {
Index: src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java	(working copy)
@@ -22,7 +22,7 @@
 /**
  * test bevahior for "ENCRYPTED" session state
  */
-public class ProtocolEncryptedTestCase extends ProtocolStateTestCase {
+public class ProtocolEncryptedTestCase extends AbstractProtocolStateTestCase {
 
     @Override
     protected SessionState getDefaultState() {
Index: src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java	(working copy)
@@ -32,7 +32,7 @@
 
 /**
  */
-public abstract class ProtocolStateTestCase extends TestCase {
+public abstract class AbstractProtocolStateTestCase extends TestCase {
     protected ProtocolWorker protocolWorker;
     protected DefaultServerRuntimeContext serverRuntimeContext;
     protected TestSessionContext sessionContext;
Index: src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
===================================================================
--- src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java	(revision 764044)
+++ src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java	(working copy)
@@ -27,7 +27,7 @@
 /**
  * test session initiation bevahior
  */
-public class ProtocolInitiatedTestCase extends ProtocolStateTestCase {
+public class ProtocolInitiatedTestCase extends AbstractProtocolStateTestCase {
 
     public void testProcessClientCanonicalStreamOpeningResponse() {