diff --git a/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java
index 75be896761..5e8c1b08c0 100644
--- a/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java
+++ b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java
@@ -25,8 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Tuna Aksoy
  * @since 1.0
  */
-//FIXME: Once the fields have been added the JsonIgnoreProperties annotation should be removed
-
 public class FilePlanComponent
 {
     @JsonProperty (required = true)
diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RecordFolderTests.java b/src/test/java/org/alfresco/rest/fileplancomponents/RecordFolderTests.java
index b4b0be64cf..1d47785196 100644
--- a/src/test/java/org/alfresco/rest/fileplancomponents/RecordFolderTests.java
+++ b/src/test/java/org/alfresco/rest/fileplancomponents/RecordFolderTests.java
@@ -71,7 +71,7 @@ public class RecordFolderTests extends BaseRestTest
     @Autowired
     public DataUser dataUser;
 
-    private static final int NUMBER_OF_FOLDER= 5;
+    private static final int NUMBER_OF_FOLDERS= 5;
     /**
      * Given that a record category exists
      * When I use the API to create a new record folder
@@ -290,7 +290,7 @@ public class RecordFolderTests extends BaseRestTest
 
         // Add child olders
         ArrayList<FilePlanComponent> children = new ArrayList<FilePlanComponent>();
-        for (int i = 0; i < NUMBER_OF_FOLDER; i++)
+        for (int i = 0; i < NUMBER_OF_FOLDERS; i++)
         {
             // Create a child
             FilePlanComponent child = createFolder(category.getId(),
@@ -337,7 +337,8 @@ public class RecordFolderTests extends BaseRestTest
                         assertEquals(createdComponent.getName(), filePlanComponent.getName());
                         assertEquals(createdComponent.getNodeType(), filePlanComponent.getNodeType());
 
-                    } catch (NoSuchElementException e)
+                    }
+                    catch (NoSuchElementException e)
                     {
                         fail("No child element for " + filePlanComponent.getId());
                     }
@@ -354,7 +355,8 @@ public class RecordFolderTests extends BaseRestTest
             try
             {
                 filePlanComponentAPI.deleteFilePlanComponent(filePlanComponentEntry.getFilePlanComponent().getId());
-            } catch (Exception e)
+            }
+            catch (Exception e)
             {
                 e.printStackTrace();
             }