Fixed akka support + tests