diff --git a/source/java/org/alfresco/rest/api/model/PathInfo.java b/source/java/org/alfresco/rest/api/model/PathInfo.java
index 2b93bef852..d060fe864f 100644
--- a/source/java/org/alfresco/rest/api/model/PathInfo.java
+++ b/source/java/org/alfresco/rest/api/model/PathInfo.java
@@ -20,7 +20,6 @@ package org.alfresco.rest.api.model;
 
 import java.util.List;
 
-import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * Representation of a path info
@@ -63,7 +62,7 @@ public class PathInfo
     public String toString()
     {
         final StringBuilder sb = new StringBuilder(120);
-        sb.append("PathInfo [name='").append(name)
+        sb.append("PathInfo [name=").append(name)
                     .append(", isComplete=").append(isComplete)
                     .append(", elements=").append(elements)
                     .append(']');
@@ -101,7 +100,7 @@ public class PathInfo
         {
             final StringBuilder sb = new StringBuilder(250);
             sb.append("PathElement [id=").append(id)
-                        .append(", name='").append(name)
+                        .append(", name=").append(name)
                         .append(']');
             return sb.toString();
         }
diff --git a/source/java/org/alfresco/rest/api/model/Rendition.java b/source/java/org/alfresco/rest/api/model/Rendition.java
index 879b1da58b..2b720f0c2c 100644
--- a/source/java/org/alfresco/rest/api/model/Rendition.java
+++ b/source/java/org/alfresco/rest/api/model/Rendition.java
@@ -70,7 +70,7 @@ public class Rendition
     public String toString()
     {
         final StringBuilder sb = new StringBuilder(150);
-        sb.append("Rendition [id='").append(id)
+        sb.append("Rendition [id=").append(id)
                     .append(", status=").append(status)
                     .append(", contentInfo=").append(contentInfo)
                     .append(']');
diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/ContentInfo.java b/source/test-java/org/alfresco/rest/api/tests/client/data/ContentInfo.java
index 689e6b1727..b6addf90ea 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/data/ContentInfo.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/data/ContentInfo.java
@@ -86,10 +86,10 @@ public class ContentInfo
     public String toString()
     {
         final StringBuilder sb = new StringBuilder(150);
-        sb.append("ContentInfo [mimeType='").append(mimeType)
-                    .append(", mimeTypeName='").append(mimeTypeName)
+        sb.append("ContentInfo [mimeType=").append(mimeType)
+                    .append(", mimeTypeName=").append(mimeTypeName)
                     .append(", sizeInBytes=").append(sizeInBytes)
-                    .append(", encoding='").append(encoding)
+                    .append(", encoding=").append(encoding)
                     .append(']');
         return sb.toString();
     }
diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/PathInfo.java b/source/test-java/org/alfresco/rest/api/tests/client/data/PathInfo.java
index f086e6dfce..d7c2990030 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/data/PathInfo.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/data/PathInfo.java
@@ -18,16 +18,11 @@
  */
 package org.alfresco.rest.api.tests.client.data;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.alfresco.service.cmr.repository.NodeRef;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 /**
  * Representation of a path info (initially for client tests for File Folder API)
  *
diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/Rendition.java b/source/test-java/org/alfresco/rest/api/tests/client/data/Rendition.java
index e649cd9229..beb9da111e 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/data/Rendition.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/data/Rendition.java
@@ -111,7 +111,7 @@ public class Rendition implements ExpectedComparison, Comparable<Rendition>
     public String toString()
     {
         final StringBuilder sb = new StringBuilder(150);
-        sb.append("Rendition [id='").append(id)
+        sb.append("Rendition [id=").append(id)
                     .append(", status=").append(status)
                     .append(", contentInfo=").append(contentInfo)
                     .append(']');