Updated akka test
Fixed the merge conflict