diff --git a/chapter22/chapter22-consumer/pom.xml b/chapter22/chapter22-consumer/pom.xml
index 9c48a408..77b646f2 100644
--- a/chapter22/chapter22-consumer/pom.xml
+++ b/chapter22/chapter22-consumer/pom.xml
@@ -28,6 +28,10 @@
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/chapter22/chapter22-service/src/main/java/org/agoncal/book/javaee7/chapter22/ApplicationConfig.java b/chapter22/chapter22-service/src/main/java/org/agoncal/book/javaee7/chapter22/ApplicationConfig.java
index 1c2e5c37..7118dcc0 100644
--- a/chapter22/chapter22-service/src/main/java/org/agoncal/book/javaee7/chapter22/ApplicationConfig.java
+++ b/chapter22/chapter22-service/src/main/java/org/agoncal/book/javaee7/chapter22/ApplicationConfig.java
@@ -1,5 +1,6 @@
 package org.agoncal.book.javaee7.chapter22;
 
+import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider;
 
 import javax.ws.rs.ApplicationPath;
@@ -32,7 +33,7 @@ public ApplicationConfig() {
     HashSet<Class<?>> c = new HashSet<>();
     c.add(BookRestService.class);
 
-    c.add(MOXyJsonProvider.class);
+    c.add(JacksonJsonProvider.class);
 
     classes = Collections.unmodifiableSet(c);
   }
diff --git a/chapter22/chapter22-service/src/test/java/org/agoncal/book/javaee7/chapter22/BookRestServiceIT.java b/chapter22/chapter22-service/src/test/java/org/agoncal/book/javaee7/chapter22/BookRestServiceIT.java
index c35345ab..0888061e 100644
--- a/chapter22/chapter22-service/src/test/java/org/agoncal/book/javaee7/chapter22/BookRestServiceIT.java
+++ b/chapter22/chapter22-service/src/test/java/org/agoncal/book/javaee7/chapter22/BookRestServiceIT.java
@@ -1,5 +1,8 @@
 package org.agoncal.book.javaee7.chapter22;
 
+import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
+import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.ws.rs.client.Client;
@@ -15,6 +18,7 @@
 import java.net.URI;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Antonio Goncalves
@@ -34,6 +38,11 @@ public class BookRestServiceIT {
 
   private static final String XML = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><book><description>Science fiction comedy book</description><illustrations>false</illustrations><isbn>1-84023-742-2</isbn><nbOfPage>354</nbOfPage><price>12.5</price><title>The Hitchhiker's Guide to the Galaxy</title></book>";
 
+  @BeforeClass
+  public static void setupClass() {
+      client.configuration().register(MOXyJsonProvider.class);
+  }
+
   // ======================================
   // =              Unit tests            =
   // ======================================
@@ -63,6 +72,31 @@ public void shouldMarshallAListOfBooks() throws JAXBException {
     m.marshal(books, writer);
   }
 
+  @Test
+  public void shouldCreateReadAndDeleteTwoBooks() throws JAXBException {
+      Book firstBook = new Book("The Hitchhiker's Guide to the Galaxy", 12.5F, "Science fiction comedy book", "1-84023-742-2", 354, false);
+      Response firstResponse = client.target(uri).request().post(Entity.entity(firstBook, MediaType.APPLICATION_XML));
+      assertEquals(Response.Status.CREATED, firstResponse.getStatusInfo());
+
+      Book secondBook = new Book("The Hitchhiker's Guide to the Galaxy, part 2", 42.5F, "Science fiction comedy book", "1-84023-742-x", 23, false);
+      Response secondResponse = client.target(uri).request().post(Entity.entity(secondBook, MediaType.APPLICATION_XML));
+      assertEquals(Response.Status.CREATED, secondResponse.getStatusInfo());
+
+      Response response = client.target(uri).request(MediaType.APPLICATION_JSON).get();
+      assertEquals(Response.Status.OK, response.getStatusInfo());
+      Books books = response.readEntity(Books.class);
+      assertTrue(books.size() == 2);
+
+      response = client.target(firstResponse.getLocation()).request().delete();
+      assertEquals(Response.Status.NO_CONTENT, response.getStatusInfo());
+      response = client.target(secondResponse.getLocation()).request().delete();
+      assertEquals(Response.Status.NO_CONTENT, response.getStatusInfo());
+
+      response = client.target(uri).request(MediaType.APPLICATION_JSON).get();
+      assertEquals(Response.Status.OK, response.getStatusInfo());
+      assertTrue(response.readEntity(Books.class).isEmpty());
+  }
+
 
   @Test
   public void shouldCreateAndDeleteABook() throws JAXBException {
diff --git a/pom.xml b/pom.xml
index 2c1c7b77..3ba2c2ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <version.glassfish>4.0-b72</version.glassfish>
     <version.weld>2.0.0.Beta3</version.weld>
     <version.jersey>2.0-m10</version.jersey>
-    <version.eclipselink>2.5.0-M6</version.eclipselink>
+    <version.eclipselink>2.5.0-M7</version.eclipselink>
     <version.hibernate.validator>5.0.0.Alpha2</version.hibernate.validator>
     <version.json>1.0-b04</version.json>
     <!-- Databases -->