diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CharacterizationServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CharacterizationServicesTest.java
index d747f23335..6666ab68d2 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CharacterizationServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CharacterizationServicesTest.java
@@ -41,7 +41,7 @@ public void testSetupEdit() {
 
 		Response res =
 				given().contentType("application/json").cookie("JSESSIONID=" + jsessionId)
-				.parameter("sampleId", "69500928").expect()
+				.parameter("sampleId", "57442308").expect()
 				.body("type", hasItems("physico-chemical characterization",
 						"in vitro characterization",
 						"ex vivo"))
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ChemicalAssociationServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ChemicalAssociationServicesTest.java
index 9b1ff1fc3d..6760237d81 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ChemicalAssociationServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ChemicalAssociationServicesTest.java
@@ -23,7 +23,6 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Test;
 
 import com.jayway.restassured.response.Response;
@@ -36,7 +35,7 @@ public void testSetup() {
 
 		Response res =
 				given().contentType("application/json")
-				.parameter("sampleId", "20917510").expect()
+				.parameter("sampleId", "20917508").expect()
 				.body("chemicalAssociationTypes", hasItems("Association","attachment","encapsulation","entrapment","intercalation"))
 						.when().get("http://localhost:8080/caNanoLab/rest/chemicalAssociation/setup");
 
@@ -50,7 +49,7 @@ public void testEdit() {
 		
 		Map<String, String> parameters = new HashMap<String, String>();
 		parameters.put("sampleId", "20917508");
-		parameters.put("dataId", "73793538");
+		parameters.put("dataId", "59670528");
 		Response res =
 				given().contentType("application/json").cookie("JSESSIONID=" + jsessionId)
 				.parameters(parameters).expect()
@@ -83,10 +82,10 @@ public void testGetComposingElementsByNanomaterialEntityId() {
 		
 		String jsessionId = RestTestLoginUtil.loginTest();
 		Map<String, String> parameters = new HashMap<String, String>();
-		parameters.put("id", "84377600");
+		parameters.put("id", "21867783");
 		ValidatableResponse res =
 				given().contentType("application/json").cookie("JSESSIONID=" + jsessionId)
-				.queryParam("id", "84377600")
+				.queryParam("id", "21867783")
 						.when().post("http://localhost:8080/caNanoLab/rest/chemicalAssociation/getComposingElementsByNanomaterialEntityId")
 		.then().body(containsString("RNA"));
 		RestTestLoginUtil.logoutTest();
@@ -123,7 +122,6 @@ public void testsaveFile() {
 
 	final Client aClient = ClientBuilder.newBuilder()
 	        .register(ObjectMapperProvider.class)
-	        .register(JacksonFeature.class)
 	        .build();
 	
 	WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -177,7 +175,6 @@ public void testRemoveFile() {
 
 	final Client aClient = ClientBuilder.newBuilder()
 	        .register(ObjectMapperProvider.class)
-	        .register(JacksonFeature.class)
 	        .build();
 	
 	WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -230,7 +227,6 @@ public void testSubmit() {
 
 	final Client aClient = ClientBuilder.newBuilder()
 	        .register(ObjectMapperProvider.class)
-	        .register(JacksonFeature.class)
 	        .build();
 	
 	WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -284,7 +280,6 @@ public void testDelete() {
 
 	final Client aClient = ClientBuilder.newBuilder()
 	        .register(ObjectMapperProvider.class)
-	        .register(JacksonFeature.class)
 	        .build();
 	
 	WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CompositionServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CompositionServicesTest.java
index 0b5c9c0e21..22de479fc3 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CompositionServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CompositionServicesTest.java
@@ -5,7 +5,6 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 
-import org.glassfish.jersey.client.ClientConfig;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -16,10 +15,7 @@ public class CompositionServicesTest {
 
 	@Before
 	public void setUp() throws Exception {
-		client = ClientBuilder.newClient(new ClientConfig()
-		//.register(MyClientResponseFilter.class)
-		//.register(new AnotherClientFilter())
-				);
+		client = ClientBuilder.newClient();
 	}
 	@Test
 	public void testSummaryView() {
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CoreServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CoreServicesTest.java
index bc14416d46..2a8ace088b 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CoreServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CoreServicesTest.java
@@ -22,7 +22,7 @@
 public class CoreServicesTest {
 	
 	String urlbase = "http://localhost:8080/caNanoLab/rest/";
-	
+	Client client;
 	@Before
 	public void setUp() throws Exception {
 		
@@ -34,10 +34,7 @@ public void tearDown() throws Exception {
 
 	@Test
 	public void testInitSetup() {
-		Client client = ClientBuilder.newClient(new ClientConfig()
-		//.register(MyClientResponseFilter.class)
-		//.register(new AnotherClientFilter())
-				);
+		client = ClientBuilder.newClient();
 
 		String jsonString = client.target(urlbase)
 				.register(CoreServices.class)
@@ -55,10 +52,7 @@ public void testInitSetup() {
 	
 	@Test
 	public void testGetTabs() {
-		Client client = ClientBuilder.newClient(new ClientConfig()
-		//.register(MyClientResponseFilter.class)
-		//.register(new AnotherClientFilter())
-				);
+		client = ClientBuilder.newClient();
 
 		String jsonString = client.target(urlbase)
 				.register(CoreServices.class)
@@ -76,7 +70,7 @@ public void testGetFavorites(){
 		Response res =
 				given().contentType("application/json").cookie("JSESSIONID=" + jsessionId)
 				.expect()
-				.body("samples.dataName", equalToIgnoringCase("Sample 1"))
+				.body("samples.dataName", equalToIgnoringCase("test_HJ_11"))
 						.when().get("http://localhost:8080/caNanoLab/rest/core/getFavorites");
 		
 		RestTestLoginUtil.logoutTest();
@@ -87,8 +81,8 @@ public void testAddFavorites(){
 		String jsessionId = RestTestLoginUtil.loginTest();
 		FavoriteBean form = new FavoriteBean();
 		form.setDataType("sample");
-		form.setDataId("57835520");
-		form.setDataName("TestSample_Harika");
+		form.setDataId("56229901");
+		form.setDataName("test_HJ_12");
 		Response res =
 				given() .contentType("application/json").cookie("JSESSIONID=" + jsessionId).body(form)
 				.expect().statusCode(200)
@@ -101,8 +95,8 @@ public void testDeleteFavorites(){
 		String jsessionId = RestTestLoginUtil.loginTest();
 		FavoriteBean form = new FavoriteBean();
 		form.setDataType("sample");
-		form.setDataId("94699520");
-		form.setDataName("Test_HJ_DEV_01");
+		form.setDataId("56229895");
+		form.setDataName("test_HJ-10");
 		form.setId(new Long(105283586));
 		Response res =
 				given() .contentType("application/json").cookie("JSESSIONID=" + jsessionId).body(form)
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CurationServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CurationServicesTest.java
index 64048f3f83..bcdde77064 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CurationServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/CurationServicesTest.java
@@ -11,7 +11,6 @@
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -24,7 +23,7 @@ public class CurationServicesTest {
 	
 	@Before
 	public void setUp() throws Exception {
-		client = ClientBuilder.newClient(new ClientConfig());
+		client = ClientBuilder.newClient();
 						
 	}
 	@Test
@@ -50,7 +49,6 @@ public void testGenerateBatchDataAvailability() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/FunctionalizingEntityServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/FunctionalizingEntityServicesTest.java
index 87a4e61110..b78afc3716 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/FunctionalizingEntityServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/FunctionalizingEntityServicesTest.java
@@ -21,7 +21,6 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Test;
 
 import com.jayway.restassured.response.Response;
@@ -73,7 +72,6 @@ public void testSaveFunction() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -110,7 +108,6 @@ public void testRemoveComposingElement() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -151,7 +148,6 @@ public void testsaveFile() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -195,7 +191,6 @@ public void testRemoveFile() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -245,7 +240,6 @@ public void testSubmit() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -295,7 +289,6 @@ public void testDelete() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/NanomaterialEntityServiceTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/NanomaterialEntityServiceTest.java
index 439a140e16..1288d04fbb 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/NanomaterialEntityServiceTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/NanomaterialEntityServiceTest.java
@@ -22,7 +22,6 @@
 import gov.nih.nci.cananolab.restful.view.edit.SimpleSubmitPublicationBean;
 
 import org.apache.commons.collections.map.HashedMap;
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Test;
 
 import com.jayway.restassured.response.Response;
@@ -35,7 +34,7 @@ public void testSetup() {
 		Response res =
 				given().contentType("application/json")
 				.parameter("sampleId", "20917510").expect()
-				.body("nanomaterialEntityTypes", hasItems("biopolymer","carbon","carbon black","carbon nanotube","dendrimer","emulsion","fullerene","liposome","metal oxide","metal particle","metalloid","nanohorn","nanolipogel","nanorod","nanoshell","polymer","quantum dot","silica"))
+				.body("nanomaterialEntityTypes", hasItems("biopolymer", "carbon", "carbon black", "carbon nanotube", "dendrimer", "emulsion", "fullerene", "liposome", "metal oxide", "metal particle", "metalloid", "nanohorn", "nanorod", "nanoshell", "polymer", "quantum dot", "silica"))
 						.when().get("http://localhost:8080/caNanoLab/rest/nanomaterialEntity/setup");
 
 		System.out.println(res.getBody().asString());
@@ -106,7 +105,6 @@ public void testSaveComposingElement() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -148,7 +146,6 @@ public void testRemoveComposingElement() {
 
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -190,7 +187,6 @@ public void testsaveFile() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -232,7 +228,6 @@ public void testRemoveFile() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -283,7 +278,6 @@ public void testSubmit() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -333,7 +327,6 @@ public void testDelete() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ProtocolServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ProtocolServicesTest.java
index 000f38b56f..5c0ce05a7d 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ProtocolServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/ProtocolServicesTest.java
@@ -18,7 +18,6 @@
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -33,7 +32,7 @@ public class ProtocolServicesTest {
 	
 	@Before
 	public void setUp() throws Exception {
-		client = ClientBuilder.newClient(new ClientConfig());
+		client = ClientBuilder.newClient();
 						
 	}
 	
@@ -63,7 +62,6 @@ public void testSearchProtocol() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -93,7 +91,7 @@ public void testdownload() {
 		String jsonString = client.target(urlbase)
 				.register(ProtocolServices.class)
 				.path("protocol/download")
-				.queryParam("fileId", "23178496") 
+				.queryParam("fileId", "59768832") 
 				.request("application/pdf")
 				.header("some-header", "true")
 				.get(String.class);
@@ -110,7 +108,6 @@ public void testSubmitProtocol() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -168,7 +165,6 @@ public void testSaveAccess() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -221,7 +217,6 @@ public void testDeleteAccess() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -262,7 +257,6 @@ public void testDeletePublication() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -309,7 +303,6 @@ public void testSubmitForReview() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/PublicationServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/PublicationServicesTest.java
index 7429e0315f..f0d5af5699 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/PublicationServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/PublicationServicesTest.java
@@ -28,7 +28,6 @@
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -41,10 +40,7 @@ public class PublicationServicesTest {
 	
 	@Before
 	public void setUp() throws Exception {
-		client = ClientBuilder.newClient(new ClientConfig()
-		//.register(MyClientResponseFilter.class)
-		//.register(new AnotherClientFilter())
-				);
+		client = ClientBuilder.newClient();
 	}
 	@Test
 	public void testSummaryView() {
@@ -63,7 +59,7 @@ public void testdownload() {
 		String jsonString = client.target(urlbase)
 				.register(PublicationServices.class)
 				.path("publication/download")
-				.queryParam("fileId", "23178496") 
+				.queryParam("fileId", "59768833") 
 				.request("application/pdf")
 				.header("some-header", "true")
 				.get(String.class);
@@ -108,7 +104,6 @@ public void testSearchPublication() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -143,7 +138,6 @@ public void testSubmitPublication() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -202,13 +196,23 @@ public void testEdit() {
 	@Test
 	public void testGetSamples() {
 		try{
-		String jsonString = client.target(urlbase)
-				.register(PublicationServices.class)
-				.path("publication/getSamples")
-				.queryParam("searchStr", "ncl-24-1") 
-				.request("application/json")
-				.header("some-header", "true")
-				.get(String.class);
+			String jsessionId = RestTestLoginUtil.loginTest();
+			Map<String, String> parameters = new HashMap<String, String>();
+			parameters.put("searchStr", "ncl-24-1");
+			
+			com.jayway.restassured.response.Response res =
+					given().contentType("application/json").cookie("JSESSIONID=" + jsessionId)
+					.parameters(parameters).expect()
+					.body("category", equalToIgnoringCase("Test Pub Type"))
+							.when().get("http://localhost:8080/caNanoLab/rest/publication/getSamples");
+
+//		String jsonString = client.target(urlbase)
+//				.register(PublicationServices.class)
+//				.path("publication/getSamples")
+//				.queryParam("searchStr", "ncl-24-1") 
+//				.request("application/json")
+//				.header("some-header", "true")
+//				.get(String.class);
 		}catch(Exception e){
 			assertTrue("NotAuthorizedException", e.toString().contains("Unauthorized"));
 		}
@@ -264,7 +268,6 @@ public void testSaveAccess() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -318,7 +321,6 @@ public void testDeleteAccess() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -360,7 +362,6 @@ public void testDeletePublication() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
@@ -391,7 +392,6 @@ public void testSubmitForReview() {
 		
 		final Client aClient = ClientBuilder.newBuilder()
 		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
 		        .build();
 		
 		WebTarget webTarget = aClient.target("http://localhost:8080/caNanoLab/rest");
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SampleServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SampleServicesTest.java
index 9361229cfa..7a84f0e472 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SampleServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SampleServicesTest.java
@@ -2,21 +2,12 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import gov.nih.nci.cananolab.restful.view.SimpleSampleBean;
+
 import gov.nih.nci.cananolab.restful.view.edit.SampleEditGeneralBean;
 import gov.nih.nci.cananolab.restful.view.edit.SimplePointOfContactBean;
-import gov.nih.nci.cananolab.service.security.UserBean;
-import gov.nih.nci.cananolab.ui.form.SearchSampleForm;
-import gov.nih.nci.cananolab.util.Constants;
 
-import java.util.List;
+import gov.nih.nci.cananolab.ui.form.SearchSampleForm;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import javax.ws.rs.NotAuthorizedException;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -24,8 +15,6 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,10 +28,7 @@ public class SampleServicesTest {
 	@Before
 	public void setUp() throws Exception {
 	
-		client = ClientBuilder.newBuilder()
-		        .register(ObjectMapperProvider.class)
-		        .register(JacksonFeature.class)
-		        .build();
+		client = ClientBuilder.newClient();
 	}
 
 	@Test
diff --git a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SecurityServicesTest.java b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SecurityServicesTest.java
index 77174f540e..11c83654dc 100644
--- a/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SecurityServicesTest.java
+++ b/software/cananolab-webapp/test-rest/java/gov/nih/nci/cananolab/restful/SecurityServicesTest.java
@@ -16,10 +16,7 @@ public class SecurityServicesTest {
 
 	@Before
 	public void setUp() throws Exception {
-		client = ClientBuilder.newClient(new ClientConfig()
-		//.register(MyClientResponseFilter.class)
-		//.register(new AnotherClientFilter())
-				);
+		client = ClientBuilder.newClient();
 	}
 
 	@Test