diff --git a/baas-protocol-recipe-event-publishing/src/main/scala/com/ing/baker/baas/recipelistener/RemoteEventListenerClient.scala b/baas-protocol-recipe-event-publishing/src/main/scala/com/ing/baker/baas/recipelistener/RemoteEventListenerClient.scala
deleted file mode 100644
index b8eb084c..00000000
--- a/baas-protocol-recipe-event-publishing/src/main/scala/com/ing/baker/baas/recipelistener/RemoteEventListenerClient.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.ing.baker.baas.recipelistener
-
-import cats.data.EitherT
-import cats.effect.{ContextShift, IO, Resource, Timer}
-import cats.implicits._
-import org.http4s.Method._
-import org.http4s.client.Client
-import org.http4s.client.dsl.io._
-import org.http4s.{DecodeFailure, EntityDecoder, EntityEncoder, MalformedMessageBodyFailure, MediaRange, MediaType, Status, Uri}
-import com.ing.baker.baas.protocol.DistributedEventPublishingProto._
-import com.ing.baker.baas.protocol.ProtocolDistributedEventPublishing
-import com.ing.baker.runtime.scaladsl.{EventInstance, RecipeEventMetadata}
-import com.ing.baker.runtime.serialization.{Encryption, ProtoMap}
-import org.http4s.EntityDecoder.collectBinary
-
-import scala.util.{Failure, Success}
-
-class RemoteEventListenerClient(client: Resource[IO, Client[IO]], hostname: Uri)(implicit cs: ContextShift[IO], timer: Timer[IO]) {
-
-  private type ProtoMessage[A] = scalapb.GeneratedMessage with scalapb.Message[A]
-
-  private implicit def protoDecoder[A, P <: ProtoMessage[P]](implicit protoMap: ProtoMap[A, P]): EntityDecoder[IO, A] =
-    EntityDecoder.decodeBy(MediaType.application.`octet-stream`)(collectBinary[IO]).map(_.toArray)
-      .flatMapR { bytes =>
-        protoMap.fromByteArray(bytes) match {
-          case Success(a) =>
-            EitherT.fromEither[IO](Right(a))
-          case Failure(exception) =>
-            EitherT.fromEither[IO](Left(MalformedMessageBodyFailure(exception.getMessage, Some(exception))))
-        }
-    }
-
-  private implicit def protoEitherDecoder[A, P0 <: ProtoMessage[P0], B, P1 <: ProtoMessage[P1]](implicit m1: ProtoMap[A, P0], m2: ProtoMap[B, P1]): EntityDecoder[IO, Either[A, B]] =
-    protoDecoder[A, P0].map(Left(_)).orElse(protoDecoder[B, P1].map(Right(_)))
-
-  private implicit def protoEncoder[A, P <: ProtoMessage[P]](implicit protoMap: ProtoMap[A, P]): EntityEncoder[IO, A] =
-    EntityEncoder.byteArrayEncoder[IO].contramap(protoMap.toByteArray)
-
-  val intendedHost: String = hostname.authority.map(_.host.value).getOrElse("unknown")
-
-  /*
-  private implicit val serializersProvider: SerializersProvider =
-    SerializersProvider(system, encryption)
-
-  private val root: Path = Path./("api")./("v3")
-
-  private def withPath(path: Path): Uri = hostname.withPath(path)
-
-  def apply(recipeEventMetadata: RecipeEventMetadata, event: EventInstance): Future[Unit] =
-    for {
-      encoded <- Marshal(ProtocolDistributedEventPublishing.Event(recipeEventMetadata, event)).to[MessageEntity]
-      request = HttpRequest(method = HttpMethods.POST, uri = withPath(root./("apply")), entity = encoded)
-        .withHeaders(RawHeader("X-Bakery-Intent", s"Remote-Event-Listener:$intendedHost"))
-      response <- Http().singleRequest(request)
-    } yield ()
-   */
-}
diff --git a/baas-node-event-listener/src/test/scala/com/ing/baker/baas/recipelistener/BakeryFunSpec.scala b/baker-interface/src/test/scala/com/ing/baker/baas/utils/BakeryFunSpec.scala
similarity index 95%
rename from baas-node-event-listener/src/test/scala/com/ing/baker/baas/recipelistener/BakeryFunSpec.scala
rename to baker-interface/src/test/scala/com/ing/baker/baas/utils/BakeryFunSpec.scala
index 2558d733..290edd85 100644
--- a/baas-node-event-listener/src/test/scala/com/ing/baker/baas/recipelistener/BakeryFunSpec.scala
+++ b/baker-interface/src/test/scala/com/ing/baker/baas/utils/BakeryFunSpec.scala
@@ -1,12 +1,10 @@
-package com.ing.baker.baas.recipelistener
-
-import java.net.{InetAddress, InetSocketAddress}
+package com.ing.baker.baas.utils
 
+import cats.syntax.apply._
 import cats.effect.{ContextShift, IO, Resource, Timer}
-import cats.implicits._
-import org.scalactic.source
 import org.scalatest.compatible.Assertion
 import org.scalatest.{ConfigMap, FutureOutcome, Tag, fixture}
+import org.scalactic.source
 
 import scala.concurrent.duration._
 
diff --git a/build.sbt b/build.sbt
index 7f717dac..6d6fef8a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -84,9 +84,11 @@ lazy val `baker-interface` = project.in(file("baker-interface"))
     moduleName := "baker-interface",
     libraryDependencies ++= Seq(
       akkaActor,
-      catsCore,
+      catsEffect,
       scalaJava8Compat
-    ) ++ providedDeps(findbugs)
+    ) ++ providedDeps(findbugs) ++ testDeps(
+      scalaTest
+    )
   )
   .dependsOn(intermediateLanguage)
 
diff --git a/runtime/src/test/scala/com/ing/baker/runtime/akka/actor/serialization/SerializationSpec.scala b/runtime/src/test/scala/com/ing/baker/runtime/akka/actor/serialization/SerializationSpec.scala
index bc61e50b..df158f1c 100644
--- a/runtime/src/test/scala/com/ing/baker/runtime/akka/actor/serialization/SerializationSpec.scala
+++ b/runtime/src/test/scala/com/ing/baker/runtime/akka/actor/serialization/SerializationSpec.scala
@@ -190,6 +190,48 @@ class SerializationSpec extends TestKit(ActorSystem("BakerProtobufSerializerSpec
   checkFor[ProcessInstanceProtocol.TransitionFired].run
 
   checkFor[CompiledRecipe].run
+
+  test("Encryption works for the AnyRefMapping (case class)") {
+
+    val data = GetRecipe("test")
+    val encryption = new AESEncryption(List.fill(16)("0").mkString)
+    val withEncryption = serializer.serializersProvider.copy(encryption = encryption)
+    val withoutEncryption = serializer.serializersProvider.copy(encryption = NoEncryption)
+    val mapperEncryption = SerializedDataProto.akkaAnyRefMapping(withEncryption)
+    val mapperNoEncryption = SerializedDataProto.akkaAnyRefMapping(withoutEncryption)
+
+    val protoEn = mapperEncryption.toProto(data)
+    val protoNe = mapperNoEncryption.toProto(data)
+
+    val xEn = protoEn.data.get
+    val xNe = protoNe.data.get
+    assert(xEn != xNe)
+
+    val yEn = mapperEncryption.fromProto(protoEn).get.asInstanceOf[GetRecipe]
+    val yNe = mapperNoEncryption.fromProto(protoNe).get.asInstanceOf[GetRecipe]
+    assert(yEn == yNe)
+  }
+
+  test("Encryption works for the AnyRefMapping (primitive value)") {
+
+    val data = "test"
+    val encryption = new AESEncryption(List.fill(16)("0").mkString)
+    val withEncryption = serializer.serializersProvider.copy(encryption = encryption)
+    val withoutEncryption = serializer.serializersProvider.copy(encryption = NoEncryption)
+    val mapperEncryption = SerializedDataProto.akkaAnyRefMapping(withEncryption)
+    val mapperNoEncryption = SerializedDataProto.akkaAnyRefMapping(withoutEncryption)
+
+    val protoEn = mapperEncryption.toProto(data)
+    val protoNe = mapperNoEncryption.toProto(data)
+
+    val xEn = protoEn.data.get
+    val xNe = protoNe.data.get
+    assert(xEn != xNe)
+
+    val yEn = mapperEncryption.fromProto(protoEn).get.asInstanceOf[String]
+    val yNe = mapperNoEncryption.fromProto(protoNe).get.asInstanceOf[String]
+    assert(yEn == yNe)
+  }
 }
 
 object SerializationSpec {