diff --git a/jaxrsdemo/jaxrsdemo.iml b/jaxrsdemo/jaxrsdemo.iml
index d344a87..dc9c244 100644
--- a/jaxrsdemo/jaxrsdemo.iml
+++ b/jaxrsdemo/jaxrsdemo.iml
@@ -4,10 +4,7 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="EclipseLink" />
-        <datasource-mapping>
-          <factory-entry name="NewPersistenceUnit" />
-        </datasource-mapping>
+        <datasource-mapping />
         <naming-strategy-map />
         <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
       </configuration>
diff --git a/jaxrsdemo/src/test/java/it/plague/jeedemo/BookRestServiceIT.java b/jaxrsdemo/src/test/java/it/plague/jeedemo/BookRestServiceIT.java
new file mode 100644
index 0000000..8702647
--- /dev/null
+++ b/jaxrsdemo/src/test/java/it/plague/jeedemo/BookRestServiceIT.java
@@ -0,0 +1,84 @@
+package it.plague.jeedemo;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import java.net.URI;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriBuilder;
+import org.junit.Test;
+
+public class BookRestServiceIT {
+
+  private static URI uri = UriBuilder.fromUri("http://localhost/jaxrsdemo-1.0-SNAPSHOT/rs/book")
+      .port(8080).build();
+
+  private static Client client = ClientBuilder.newClient();
+
+  @Test
+  public void shouldNotCreateANullBook() {
+    // POSTs a null book
+    Response response = client.target(uri)
+        .request()
+        .post(Entity.entity(null, MediaType.APPLICATION_XML));
+    assertThat(response.getStatus(), is(Status.BAD_REQUEST.getStatusCode()));
+  }
+
+  @Test
+  public void shouldNOtFindTheBookID() {
+    // GETs a book with an unknown ID
+    Response response = client.target(uri)
+        .path("unknownID")
+        .request()
+        .get();
+    assertThat(response.getStatus(), is(Status.NOT_FOUND.getStatusCode()));
+  }
+
+  @Test
+  public void shouldCreateAndDeleteABook() {
+    Book book = Book.builder()
+        .title("H2G2")
+        .price(12.5f)
+        .description("Science book")
+        .isbn("1-84023-742-2")
+        .nbOfPage(354)
+        .illustrations(false)
+        .build();
+
+    // POSTs a book
+    Response response = client.target(uri)
+        .request()
+        .post(Entity.entity(book, MediaType.APPLICATION_XML));
+    assertThat(response.getStatus(), is(Status.CREATED.getStatusCode()));
+    URI bookUri = response.getLocation();
+
+    // With the location, GETs the book
+    response = client.target(bookUri)
+        .request()
+        .get();
+    book = response.readEntity(Book.class);
+    assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
+    assertEquals("H2G2", book.getTitle());
+
+    // Gets the book id and DELETEs it
+    String bookId = bookUri.toString().split("/")[6];
+    response = client.target(uri)
+        .path(bookId)
+        .request()
+        .delete();
+    assertThat(response.getStatus(), is(Status.NO_CONTENT.getStatusCode()));
+
+    // GETs the book and checks it has been deleted
+    response = client.target(bookUri)
+        .request()
+        .get();
+    assertThat(response.getStatus(), is(Status.NOT_FOUND.getStatusCode()));
+  }
+
+}