diff --git a/akka-active-object-test/pom.xml b/akka-active-object-test/pom.xml
index 62935a30b4..2b4183724e 100644
--- a/akka-active-object-test/pom.xml
+++ b/akka-active-object-test/pom.xml
@@ -40,7 +40,13 @@
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-core_2.8.0.RC3</artifactId>
-      <version>0.9</version>
+      <version>0.9.1</version>
+      <exclusions>
+				<exclusion>
+					 <groupId>org.multiverse</groupId>
+            		<artifactId>multiverse-alpha</artifactId>
+				</exclusion>
+			</exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -54,6 +60,12 @@
       <version>2.4.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+            <groupId>org.multiverse</groupId>
+            <artifactId>multiverse-alpha</artifactId>
+            <version>0.6-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
   </dependencies>
 
   <build>
diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java
new file mode 100644
index 0000000000..edc26f6695
--- /dev/null
+++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java
@@ -0,0 +1,35 @@
+package se.scalablesolutions.akka.api;
+
+import static se.scalablesolutions.akka.actor.ActiveObject.link;
+import static se.scalablesolutions.akka.actor.ActiveObject.newInstance;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import se.scalablesolutions.akka.config.OneForOneStrategy;
+import junit.framework.TestCase;
+
+/**
+ * <p>Small misc tests that do not fit anywhere else and does not require a separate testcase</p>
+ * 
+ * @author johanrask
+ *
+ */
+public class MiscActiveObjectTest extends TestCase {
+
+	
+	/**
+	 * Verifies that both preRestart and postRestart methods are invoked when
+	 * an actor is restarted
+	 */
+	public void testFailingPostRestartInvocation() throws InterruptedException {
+		SimpleJavaPojo pojo = newInstance(SimpleJavaPojo.class,500);
+		SimpleJavaPojo supervisor = newInstance(SimpleJavaPojo.class,500);
+		link(supervisor,pojo,new OneForOneStrategy(3, 2000),new Class[]{Throwable.class});
+		pojo.throwException();
+		Thread.sleep(500);
+		Assert.assertTrue(pojo.pre);
+		Assert.assertTrue(pojo.post);
+	}
+	
+}
diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
index d0c22470e2..d4b4fd7687 100644
--- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
+++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
@@ -38,7 +38,7 @@ public class RemoteInMemoryStateTest extends TestCase {
   }
 
   public void testMapShouldRollbackStateForStatefulServerInCaseOfFailure() {
-    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
+    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 10000, "localhost", 9999);
     stateful.init();
     stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
     InMemFailer failer = ActiveObject.newRemoteInstance(InMemFailer.class, 1000, "localhost", 9999); //conf.getInstance(InMemFailer.class);
@@ -51,7 +51,7 @@ public class RemoteInMemoryStateTest extends TestCase {
   }
 
   public void testVectorShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
-    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
+    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 10000, "localhost", 9999);
     stateful.init();
     stateful.setVectorState("init"); // set init state
     stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
@@ -59,10 +59,10 @@ public class RemoteInMemoryStateTest extends TestCase {
   }
 
   public void testVectorShouldRollbackStateForStatefulServerInCaseOfFailure() {
-    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
+    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 10000, "localhost", 9999);
     stateful.init();
     stateful.setVectorState("init"); // set init state
-    InMemFailer failer = ActiveObject.newRemoteInstance(InMemFailer.class, 1000, "localhost", 9999); //conf.getInstance(InMemFailer.class);
+    InMemFailer failer = ActiveObject.newRemoteInstance(InMemFailer.class, 10000, "localhost", 9999); //conf.getInstance(InMemFailer.class);
     try {
       stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer); // call failing transactionrequired method
       fail("should have thrown an exception");
@@ -72,7 +72,7 @@ public class RemoteInMemoryStateTest extends TestCase {
   }
 
   public void testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
-    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
+    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 10000, "localhost", 9999);
     stateful.init();
     stateful.setRefState("init"); // set init state
     stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
@@ -80,10 +80,10 @@ public class RemoteInMemoryStateTest extends TestCase {
   }
 
   public void testRefShouldRollbackStateForStatefulServerInCaseOfFailure() {
-    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
+    InMemStateful stateful = ActiveObject.newRemoteInstance(InMemStateful.class, 10000, "localhost", 9999);
     stateful.init();
     stateful.setRefState("init"); // set init state
-    InMemFailer failer = ActiveObject.newRemoteInstance(InMemFailer.class, 1000, "localhost", 9999); //conf.getInstance(InMemFailer.class);
+    InMemFailer failer = ActiveObject.newRemoteInstance(InMemFailer.class, 10000, "localhost", 9999); //conf.getInstance(InMemFailer.class);
     try {
       stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer); // call failing transactionrequired method
       fail("should have thrown an exception");
diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java
new file mode 100644
index 0000000000..c783fd2902
--- /dev/null
+++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java
@@ -0,0 +1,36 @@
+package se.scalablesolutions.akka.api;
+
+import se.scalablesolutions.akka.actor.annotation.prerestart;
+import se.scalablesolutions.akka.actor.annotation.postrestart;
+
+public class SimpleJavaPojo {
+	
+	public boolean pre = false;
+	public boolean post = false;
+	
+	private String name;
+	
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	@prerestart
+	public void pre() {
+		System.out.println("** pre()");
+		pre = true;
+	}
+	
+	@postrestart
+	public void post() {
+		System.out.println("** post()");
+		post = true;
+	}
+
+	public void throwException() {
+		throw new RuntimeException();
+	}
+}