diff --git a/akka.iws b/akka.iws
index 922ecf3c15..57cd9a4dea 100644
--- a/akka.iws
+++ b/akka.iws
@@ -6,7 +6,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="212ccd86-01aa-4780-a2f0-0d130be5abd2" name="Test" comment="Test">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-java/src/main/java/sample/java/SimpleService.java" afterPath="$PROJECT_DIR$/samples-java/src/main/java/sample/java/SimpleService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/pom.xml" afterPath="$PROJECT_DIR$/fun-test-java/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/akka-fun-test-java.iml" afterPath="$PROJECT_DIR$/fun-test-java/akka-fun-test-java.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" afterPath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
     </list>
     <list readonly="true" id="6e842704-fac6-40e9-8a67-d02385f87db9" name="Default" comment="&#10;# Brief commit desciption here&#10;&#10;# Full commit description here (comment lines starting with '#' will not be included)&#10;&#10;" />
@@ -215,19 +219,19 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
+      <file leaf-file-name="State.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="48" column="5" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0">
+            <state line="39" column="6" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="State.scala" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
+      <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="39" column="6" selection-start="1032" selection-end="1032" vertical-scroll-proportion="-8.877883">
+            <state line="87" column="0" selection-start="2599" selection-end="2599" vertical-scroll-proportion="0.6960651">
               <folding />
             </state>
           </provider>
@@ -246,7 +250,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/jersey/AkkaServlet.scala" />
         <option value="$PROJECT_DIR$/samples-scala/src/main/scala/SimpleService.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/Boot.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" />
@@ -262,6 +265,7 @@
         <option value="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala" />
         <option value="$PROJECT_DIR$/samples-java/src/main/java/sample/java/SimpleService.java" />
+        <option value="$PROJECT_DIR$/fun-test-java/pom.xml" />
       </list>
     </option>
   </component>
@@ -2249,13 +2253,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/protocol/TProtocolFactory.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="34" selection-start="227" selection-end="227" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/transport/TIOStreamTransport.class">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -2356,7 +2353,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="6" selection-start="1032" selection-end="1032" vertical-scroll-proportion="-8.877883">
+        <state line="39" column="6" selection-start="1032" selection-end="1032" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="87" column="0" selection-start="2599" selection-end="2599" vertical-scroll-proportion="0.6960651">
           <folding />
         </state>
       </provider>
diff --git a/fun-test-java/akka-fun-test-java.iml b/fun-test-java/akka-fun-test-java.iml
index 93009ab9bd..d7d5b152a6 100644
--- a/fun-test-java/akka-fun-test-java.iml
+++ b/fun-test-java/akka-fun-test-java.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
diff --git a/fun-test-java/pom.xml b/fun-test-java/pom.xml
index 2b61966c88..7e5a4fb729 100644
--- a/fun-test-java/pom.xml
+++ b/fun-test-java/pom.xml
@@ -85,6 +85,7 @@
         <configuration>
           <excludes>
             <exclude>**/Abstract*</exclude>
+            <exclude>**/*Persistent*</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
index ede7cd0f02..4fbfd95031 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
@@ -9,10 +9,10 @@ public class AllTest extends TestCase {
     TestSuite suite = new TestSuite("All Java tests");
     suite.addTestSuite(InMemoryStateTest.class);
     suite.addTestSuite(InMemNestedStateTest.class);
-    suite.addTestSuite(PersistentStateTest.class);
-    suite.addTestSuite(PersistentNestedStateTest.class);
+    //suite.addTestSuite(PersistentStateTest.class);
+    //suite.addTestSuite(PersistentNestedStateTest.class);
     suite.addTestSuite(RemoteInMemoryStateTest.class);
-    suite.addTestSuite(RemotePersistentStateTest.class);
+    //suite.addTestSuite(RemotePersistentStateTest.class);
     suite.addTestSuite(ActiveObjectGuiceConfiguratorTest.class);
     //suite.addTestSuite(RestTest.class);
     return suite;
diff --git a/kernel/src/test/scala/AllTest.scala b/kernel/src/test/scala/AllTest.scala
index b0ef909aae..a225bfb080 100644
--- a/kernel/src/test/scala/AllTest.scala
+++ b/kernel/src/test/scala/AllTest.scala
@@ -16,7 +16,7 @@ object AllTest extends TestCase {
     suite.addTestSuite(classOf[EventBasedThreadPoolDispatcherTest])
     suite.addTestSuite(classOf[ActorSpec])
     suite.addTestSuite(classOf[RemoteActorSpec])
-    suite.addTestSuite(classOf[PersistentActorSpec])
+    //suite.addTestSuite(classOf[PersistentActorSpec])
     suite.addTestSuite(classOf[InMemoryActorSpec])
     //suite.addTestSuite(classOf[TransactionClasherSpec])
     suite
diff --git a/samples-lift/akka-samples-lift.iml b/samples-lift/akka-samples-lift.iml
index d5189eca42..43f984f930 100644
--- a/samples-lift/akka-samples-lift.iml
+++ b/samples-lift/akka-samples-lift.iml
@@ -39,11 +39,6 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
@@ -75,6 +70,10 @@
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-json:1.1.1-ea" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.12" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-scala:1.1.2-ea-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.atmosphere:atmosphere-core:0.3" level="project" />