diff --git a/akka-persistence/src/test/scala/MongoPersistentActorSpec.scala b/akka-persistence/src/test/scala/MongoPersistentActorSpec.scala
index b04b2d04b4..67b116863f 100644
--- a/akka-persistence/src/test/scala/MongoPersistentActorSpec.scala
+++ b/akka-persistence/src/test/scala/MongoPersistentActorSpec.scala
@@ -1,12 +1,15 @@
 package se.scalablesolutions.akka.state
 
-import se.scalablesolutions.akka.actor.Actor
 import junit.framework.TestCase
+
 import org.junit.{Test, Before}
 import org.junit.Assert._
-import _root_.dispatch.json._
+
+import _root_.dispatch.json.{JsNumber, JsValue}
 import _root_.dispatch.json.Js._
 
+import se.scalablesolutions.akka.actor.Actor
+
 /**
  * A persistent actor based on MongoDB storage.
  * <p/>
@@ -28,155 +31,12 @@ case object LogSize
 
 class BankAccountActor extends Actor {
   makeTransactionRequired
+  private val accountState =
+    PersistentState.newMap(MongoStorageConfig())
+  private val txnLog =
+    PersistentState.newVector(MongoStorageConfig())
 
-  private lazy val accountState: PersistentMap = PersistentState.newMap(MongoStorageConfig())
-  private lazy val txnLog: PersistentVector = PersistentState.newVector(MongoStorageConfig())
-
-  def receive = {
-    // check balance
-    case Balance(accountNo) =>
-      txnLog.add("Balance:" + accountNo)
-      reply(accountState.get(accountNo).get)
-
-    // debit amount: can fail
-    case Debit(accountNo, amount, failer) =>
-      txnLog.add("Debit:" + accountNo + " " + amount)
-      val m: BigInt =
-      accountState.get(accountNo) match {
-        case None => 0
-        case Some(v) => v.asInstanceOf[BigInt]
-      }
-      accountState.put(accountNo, (m - amount))
-      if (amount > m)
-        failer !! "Failure"
-      reply(m - amount)
-
-    // many debits: can fail
-    // demonstrates true rollback even if multiple puts have been done
-    case MultiDebit(accountNo, amounts, failer) =>
-      txnLog.add("MultiDebit:" + accountNo + " " + amounts.map(_.intValue).foldLeft(0)(_ + _))
-      val m: BigInt =
-      accountState.get(accountNo) match {
-        case None => 0
-        case Some(v) => BigInt(v.asInstanceOf[String])
-      }
-      var bal: BigInt = 0
-      amounts.foreach {amount =>
-        bal = bal + amount
-        accountState.put(accountNo, (m - bal))
-      }
-      if (bal > m) failer !! "Failure"
-      reply(m - bal)
-
-    // credit amount
-    case Credit(accountNo, amount) =>
-      txnLog.add("Credit:" + accountNo + " " + amount)
-      val m: BigInt =
-      accountState.get(accountNo) match {
-        case None => 0
-        case Some(v) => v.asInstanceOf[BigInt]
-      }
-      accountState.put(accountNo, (m + amount))
-      reply(m + amount)
-
-    case LogSize =>
-      reply(txnLog.length.asInstanceOf[AnyRef])
-  }
-}
-
-class MongoPersistentActorSpec extends TestCase {
-  @Test
-  def testSuccessfulDebit = {
-    val bactor = new BankAccountActor
-    bactor.start
-    val failer = new PersistentFailerActor
-    failer.start
-    bactor !! Credit("a-123", 5000)
-    bactor !! Debit("a-123", 3000, failer)
-    val b = (bactor !! Balance("a-123"))
-    assertTrue(b.isDefined)
-    assertEquals(BigInt(2000), b.get)
-
-    bactor !! Credit("a-123", 7000)
-    val b1 = (bactor !! Balance("a-123"))
-    assertTrue(b1.isDefined)
-    assertEquals(BigInt(9000), b1.get)
-
-    bactor !! Debit("a-123", 8000, failer)
-    val b2 = (bactor !! Balance("a-123"))
-    assertTrue(b2.isDefined)
-    assertEquals(BigInt(1000), b2.get)
-    assertEquals(7, (bactor !! LogSize).get)
-  }
-
-  @Test
-  def testUnsuccessfulDebit = {
-    val bactor = new BankAccountActor
-    bactor.start
-    bactor !! Credit("a-123", 5000)
-
-    val b = (bactor !! Balance("a-123"))
-    assertTrue(b.isDefined)
-    assertEquals(BigInt(5000), b.get)
-
-    val failer = new PersistentFailerActor
-    failer.start
-    try {
-      bactor !! Debit("a-123", 7000, failer)
-      fail("should throw exception")
-    } catch { case e: RuntimeException => {}}
-
-    val b1 = (bactor !! Balance("a-123"))
-    assertTrue(b1.isDefined)
-    assertEquals(BigInt(5000), b1.get)
- 
-    // should not count the failed one
-    assertEquals(3, (bactor !! LogSize).get)
-  }
-
-  @Test
-  def testUnsuccessfulMultiDebit = {
-    val bactor = new BankAccountActor
-    bactor.start
-    bactor !! Credit("a-123", 5000)
-    val b = (bactor !! Balance("a-123"))
-    assertTrue(b.isDefined)
-    assertEquals(BigInt(5000), b.get)
-
-    val failer = new PersistentFailerActor
-    failer.start
-    try {
-      bactor !! MultiDebit("a-123", List(500, 2000, 1000, 3000), failer)
-      fail("should throw exception")
-    } catch { case e: RuntimeException => {}}
-
-    val b1 = (bactor !! Balance("a-123"))
-    assertTrue(b1.isDefined)
-    assertEquals(BigInt(5000), b1.get)
-
-    // should not count the failed one
-    assertEquals(3, (bactor !! LogSize).get)
-  }
-}
-
-/*
-case class Balance(accountNo: String)
-case class Debit(accountNo: String, amount: BigInt, failer: Actor)
-case class MultiDebit(accountNo: String, amounts: List[BigInt], failer: Actor)
-case class Credit(accountNo: String, amount: BigInt)
-case object LogSize
-
-class BankAccountActor extends Actor {
-  makeTransactionRequired
-
-  private var accountState: PersistentMap = _
-  private var txnLog: PersistentVector = _
-  override def initializeTransactionalState = {
-    accountState = PersistentState.newMap(MongoStorageConfig())
-    txnLog = PersistentState.newVector(MongoStorageConfig())
-  }
-
-  def receive = {
+  def receive: PartialFunction[Any, Unit] = {
     // check balance
     case Balance(accountNo) =>
       txnLog.add("Balance:" + accountNo)
@@ -189,7 +49,6 @@ class BankAccountActor extends Actor {
       accountState.get(accountNo) match {
         case None => 0
         case Some(v) => {
-          println("======= " + v)
           val JsNumber(n) = v.asInstanceOf[JsValue]
           BigInt(n.toString)
         }
@@ -309,4 +168,3 @@ class MongoPersistentActorSpec extends TestCase {
     assertEquals(3, (bactor !! LogSize).get)
   }
 }
-*/
\ No newline at end of file