From 5e54133cb35fe14648167c17fe046bd6d0d6739c Mon Sep 17 00:00:00 2001
From: andrewrlee <1517745+andrewrlee@users.noreply.github.com>
Date: Thu, 6 Jun 2019 09:05:42 +0100
Subject: [PATCH] Using shallow enzyme snapshot serializer

---
 package.json                                  |    2 +
 .../AppointmentDetails.test.js.snap           | 2423 +----
 .../AddPrisonersContainer.test.js.snap        | 2962 +-----
 .../__snapshots__/NumericInput.test.js.snap   |  589 +-
 .../Page/__snapshots__/Page.test.js.snap      |  459 +-
 .../__snapshots__/CurrentlyOut.test.js.snap   | 4358 +--------
 .../__snapshots__/EnRoute.test.js.snap        | 1934 +---
 .../__snapshots__/InReception.test.js.snap    | 3796 +-------
 .../__snapshots__/MovementsIn.test.js.snap    | 8121 ++---------------
 .../__snapshots__/MovementsOut.test.js.snap   | 1705 +---
 yarn.lock                                     |    7 +
 11 files changed, 1572 insertions(+), 24784 deletions(-)

diff --git a/package.json b/package.json
index d84f95610..1ab7f4717 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "debug": "~2.6.9",
     "dotenv": "^5.0.1",
     "ejs": "^2.6.1",
+    "enzyme-to-json": "^3.3.5",
     "express": "^4.16.3",
     "express-form-data": "^2.0.7",
     "final-form": "^4.11.0",
@@ -163,6 +164,7 @@
       "<rootDir>/config/polyfills.js"
     ],
     "setupTestFrameworkScriptFile": "<rootDir>/config/jest/setupTests.js",
+    "snapshotSerializers": ["enzyme-to-json/serializer"],
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.{js,jsx,mjs}",
       "<rootDir>/(src|backend)/**/?(*.)(spec|test).{js,jsx,mjs}"
diff --git a/src/AppointmentDetails/__snapshots__/AppointmentDetails.test.js.snap b/src/AppointmentDetails/__snapshots__/AppointmentDetails.test.js.snap
index 0e02f846c..c025fce89 100644
--- a/src/AppointmentDetails/__snapshots__/AppointmentDetails.test.js.snap
+++ b/src/AppointmentDetails/__snapshots__/AppointmentDetails.test.js.snap
@@ -1,2347 +1,90 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Appointment details should hide comment section when there is no comment to display 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <AppointmentDetails
-    appointmentTypeDescription="ACT"
-    comments=""
-    endTime=""
-    locationDescription="GYM"
-    recurring={false}
-    repeats=""
-    startTime="2019-10-10T:21:0:00Z"
-    times=""
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <UNDEFINED>
-          <strong>
-            Appointment type
-          </strong>
-          <UNDEFINED>
-            ACT
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Appointment location
-          </strong>
-          <UNDEFINED>
-            GYM
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Date and time 
-          </strong>
-          <UNDEFINED>
-            <div>
-              Thursday
-            </div>
-            10/10/2019 - 21:00
-             
-            
-          </UNDEFINED>
-        </UNDEFINED>,
-        "",
-        false,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Appointment type
-            </strong>,
-            <UNDEFINED>
-              ACT
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Appointment type",
-            },
-            "ref": null,
-            "rendered": "Appointment type",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": "ACT",
-            },
-            "ref": null,
-            "rendered": "ACT",
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Appointment location
-            </strong>,
-            <UNDEFINED>
-              GYM
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Appointment location",
-            },
-            "ref": null,
-            "rendered": "Appointment location",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": "GYM",
-            },
-            "ref": null,
-            "rendered": "GYM",
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Date and time 
-            </strong>,
-            <UNDEFINED>
-              <div>
-                Thursday
-              </div>
-              10/10/2019 - 21:00
-               
-              
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Date and time ",
-            },
-            "ref": null,
-            "rendered": "Date and time ",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <div>
-                  Thursday
-                </div>,
-                "10/10/2019 - 21:00",
-                " ",
-                "",
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": "Thursday",
-                },
-                "ref": null,
-                "rendered": "Thursday",
-                "type": "div",
-              },
-              "10/10/2019 - 21:00",
-              " ",
-              "",
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      "",
-      false,
-    ],
-    "type": Object {
-      "$$typeof": Symbol(react.forward_ref),
-      "attrs": Array [],
-      "componentStyle": ComponentStyle {
-        "componentId": "sc-bdVaJa",
-        "isStatic": true,
-        "rules": Array [
-          "
-  display: flex;
-  flex-direction: row;
-
-  div {
-    margin-right: ",
-          "20px",
-          ";
-  }
-
-  @media (max-width: ",
-          "641px",
-          ") {
-    flex-direction: column;
-    div {
-      margin-bottom: ",
-          "10px",
-          ";
-      margin-right: 0;
-    }
-  }
-",
-        ],
-      },
-      "displayName": "styled.div",
-      "foldedComponentIds": Array [],
-      "render": [Function],
-      "styledComponentId": "sc-bdVaJa",
-      "target": "div",
-      "toString": [Function],
-      "warnTooManyClasses": [Function],
-      "withComponent": [Function],
-    },
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <UNDEFINED>
-            <strong>
-              Appointment type
-            </strong>
-            <UNDEFINED>
-              ACT
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Appointment location
-            </strong>
-            <UNDEFINED>
-              GYM
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Date and time 
-            </strong>
-            <UNDEFINED>
-              <div>
-                Thursday
-              </div>
-              10/10/2019 - 21:00
-               
-              
-            </UNDEFINED>
-          </UNDEFINED>,
-          "",
-          false,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Appointment type
-              </strong>,
-              <UNDEFINED>
-                ACT
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Appointment type",
-              },
-              "ref": null,
-              "rendered": "Appointment type",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": "ACT",
-              },
-              "ref": null,
-              "rendered": "ACT",
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Appointment location
-              </strong>,
-              <UNDEFINED>
-                GYM
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Appointment location",
-              },
-              "ref": null,
-              "rendered": "Appointment location",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": "GYM",
-              },
-              "ref": null,
-              "rendered": "GYM",
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Date and time 
-              </strong>,
-              <UNDEFINED>
-                <div>
-                  Thursday
-                </div>
-                10/10/2019 - 21:00
-                 
-                
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Date and time ",
-              },
-              "ref": null,
-              "rendered": "Date and time ",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <div>
-                    Thursday
-                  </div>,
-                  "10/10/2019 - 21:00",
-                  " ",
-                  "",
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Thursday",
-                  },
-                  "ref": null,
-                  "rendered": "Thursday",
-                  "type": "div",
-                },
-                "10/10/2019 - 21:00",
-                " ",
-                "",
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        "",
-        false,
-      ],
-      "type": Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "attrs": Array [],
-        "componentStyle": ComponentStyle {
-          "componentId": "sc-bdVaJa",
-          "isStatic": true,
-          "rules": Array [
-            "
-  display: flex;
-  flex-direction: row;
-
-  div {
-    margin-right: ",
-            "20px",
-            ";
-  }
-
-  @media (max-width: ",
-            "641px",
-            ") {
-    flex-direction: column;
-    div {
-      margin-bottom: ",
-            "10px",
-            ";
-      margin-right: 0;
-    }
-  }
-",
-          ],
-        },
-        "displayName": "styled.div",
-        "foldedComponentIds": Array [],
-        "render": [Function],
-        "styledComponentId": "sc-bdVaJa",
-        "target": "div",
-        "toString": [Function],
-        "warnTooManyClasses": [Function],
-        "withComponent": [Function],
-      },
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+<styled.div>
+  <styled.div>
+    <strong>
+      Appointment type
+    </strong>
+    <styled.div>
+      ACT
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Appointment location
+    </strong>
+    <styled.div>
+      GYM
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Date and time 
+    </strong>
+    <styled.div>
+      <div>
+        Thursday
+      </div>
+      10/10/2019 - 21:00
+       
+    </styled.div>
+  </styled.div>
+</styled.div>
 `;
 
 exports[`Appointment details should render correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <AppointmentDetails
-    appointmentTypeDescription="ACT"
-    comments="test"
-    endTime=""
-    locationDescription="GYM"
-    recurring={true}
-    repeats="DAILY"
-    startTime="2019-03-20T:21:0:00Z"
-    times="5"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <UNDEFINED>
-          <strong>
-            Appointment type
-          </strong>
-          <UNDEFINED>
-            ACT
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Appointment location
-          </strong>
-          <UNDEFINED>
-            GYM
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Date and time 
-          </strong>
-          <UNDEFINED>
-            <div>
-              Wednesday
-            </div>
-            20/03/2019 - 21:00
-             
-            
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Comments
-          </strong>
-          <UNDEFINED>
-            test
-          </UNDEFINED>
-        </UNDEFINED>,
-        <UNDEFINED>
-          <strong>
-            Recurring
-          </strong>
-          <UNDEFINED>
-            Daily
-            , 
-            5
-             occurrences
-          </UNDEFINED>
-          <UNDEFINED>
-            Ends 
-            Sunday, March 24th 2019
-          </UNDEFINED>
-        </UNDEFINED>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Appointment type
-            </strong>,
-            <UNDEFINED>
-              ACT
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Appointment type",
-            },
-            "ref": null,
-            "rendered": "Appointment type",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": "ACT",
-            },
-            "ref": null,
-            "rendered": "ACT",
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Appointment location
-            </strong>,
-            <UNDEFINED>
-              GYM
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Appointment location",
-            },
-            "ref": null,
-            "rendered": "Appointment location",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": "GYM",
-            },
-            "ref": null,
-            "rendered": "GYM",
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Date and time 
-            </strong>,
-            <UNDEFINED>
-              <div>
-                Wednesday
-              </div>
-              20/03/2019 - 21:00
-               
-              
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Date and time ",
-            },
-            "ref": null,
-            "rendered": "Date and time ",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <div>
-                  Wednesday
-                </div>,
-                "20/03/2019 - 21:00",
-                " ",
-                "",
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": "Wednesday",
-                },
-                "ref": null,
-                "rendered": "Wednesday",
-                "type": "div",
-              },
-              "20/03/2019 - 21:00",
-              " ",
-              "",
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Comments
-            </strong>,
-            <UNDEFINED>
-              test
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Comments",
-            },
-            "ref": null,
-            "rendered": "Comments",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": "test",
-            },
-            "ref": null,
-            "rendered": "test",
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <strong>
-              Recurring
-            </strong>,
-            <UNDEFINED>
-              Daily
-              , 
-              5
-               occurrences
-            </UNDEFINED>,
-            <UNDEFINED>
-              Ends 
-              Sunday, March 24th 2019
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Recurring",
-            },
-            "ref": null,
-            "rendered": "Recurring",
-            "type": "strong",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                "Daily",
-                ", ",
-                "5",
-                " occurrences",
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              "Daily",
-              ", ",
-              "5",
-              " occurrences",
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                "Ends ",
-                "Sunday, March 24th 2019",
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              "Ends ",
-              "Sunday, March 24th 2019",
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-htpNat",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "5px",
-                  ";
-  @media (max-width: ",
-                  "641px",
-                  ") {
-    font-size: ",
-                  "16px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-htpNat",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bwzfXH",
-            "isStatic": true,
-            "rules": Array [
-              "
-  @media (max-width: ",
-              "641px",
-              ") {
-    margin-right: ",
-              "5px",
-              ";
-
-    strong {
-      font-size: ",
-              "16px",
-              ";
-    }
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bwzfXH",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-    ],
-    "type": Object {
-      "$$typeof": Symbol(react.forward_ref),
-      "attrs": Array [],
-      "componentStyle": ComponentStyle {
-        "componentId": "sc-bdVaJa",
-        "isStatic": true,
-        "rules": Array [
-          "
-  display: flex;
-  flex-direction: row;
-
-  div {
-    margin-right: ",
-          "20px",
-          ";
-  }
-
-  @media (max-width: ",
-          "641px",
-          ") {
-    flex-direction: column;
-    div {
-      margin-bottom: ",
-          "10px",
-          ";
-      margin-right: 0;
-    }
-  }
-",
-        ],
-      },
-      "displayName": "styled.div",
-      "foldedComponentIds": Array [],
-      "render": [Function],
-      "styledComponentId": "sc-bdVaJa",
-      "target": "div",
-      "toString": [Function],
-      "warnTooManyClasses": [Function],
-      "withComponent": [Function],
-    },
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <UNDEFINED>
-            <strong>
-              Appointment type
-            </strong>
-            <UNDEFINED>
-              ACT
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Appointment location
-            </strong>
-            <UNDEFINED>
-              GYM
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Date and time 
-            </strong>
-            <UNDEFINED>
-              <div>
-                Wednesday
-              </div>
-              20/03/2019 - 21:00
-               
-              
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Comments
-            </strong>
-            <UNDEFINED>
-              test
-            </UNDEFINED>
-          </UNDEFINED>,
-          <UNDEFINED>
-            <strong>
-              Recurring
-            </strong>
-            <UNDEFINED>
-              Daily
-              , 
-              5
-               occurrences
-            </UNDEFINED>
-            <UNDEFINED>
-              Ends 
-              Sunday, March 24th 2019
-            </UNDEFINED>
-          </UNDEFINED>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Appointment type
-              </strong>,
-              <UNDEFINED>
-                ACT
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Appointment type",
-              },
-              "ref": null,
-              "rendered": "Appointment type",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": "ACT",
-              },
-              "ref": null,
-              "rendered": "ACT",
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Appointment location
-              </strong>,
-              <UNDEFINED>
-                GYM
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Appointment location",
-              },
-              "ref": null,
-              "rendered": "Appointment location",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": "GYM",
-              },
-              "ref": null,
-              "rendered": "GYM",
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Date and time 
-              </strong>,
-              <UNDEFINED>
-                <div>
-                  Wednesday
-                </div>
-                20/03/2019 - 21:00
-                 
-                
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Date and time ",
-              },
-              "ref": null,
-              "rendered": "Date and time ",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <div>
-                    Wednesday
-                  </div>,
-                  "20/03/2019 - 21:00",
-                  " ",
-                  "",
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Wednesday",
-                  },
-                  "ref": null,
-                  "rendered": "Wednesday",
-                  "type": "div",
-                },
-                "20/03/2019 - 21:00",
-                " ",
-                "",
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Comments
-              </strong>,
-              <UNDEFINED>
-                test
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Comments",
-              },
-              "ref": null,
-              "rendered": "Comments",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": "test",
-              },
-              "ref": null,
-              "rendered": "test",
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <strong>
-                Recurring
-              </strong>,
-              <UNDEFINED>
-                Daily
-                , 
-                5
-                 occurrences
-              </UNDEFINED>,
-              <UNDEFINED>
-                Ends 
-                Sunday, March 24th 2019
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Recurring",
-              },
-              "ref": null,
-              "rendered": "Recurring",
-              "type": "strong",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  "Daily",
-                  ", ",
-                  "5",
-                  " occurrences",
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                "Daily",
-                ", ",
-                "5",
-                " occurrences",
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  "Ends ",
-                  "Sunday, March 24th 2019",
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                "Ends ",
-                "Sunday, March 24th 2019",
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-htpNat",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "5px",
-                    ";
-  @media (max-width: ",
-                    "641px",
-                    ") {
-    font-size: ",
-                    "16px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-htpNat",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bwzfXH",
-              "isStatic": true,
-              "rules": Array [
-                "
-  @media (max-width: ",
-                "641px",
-                ") {
-    margin-right: ",
-                "5px",
-                ";
-
-    strong {
-      font-size: ",
-                "16px",
-                ";
-    }
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bwzfXH",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-      ],
-      "type": Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "attrs": Array [],
-        "componentStyle": ComponentStyle {
-          "componentId": "sc-bdVaJa",
-          "isStatic": true,
-          "rules": Array [
-            "
-  display: flex;
-  flex-direction: row;
-
-  div {
-    margin-right: ",
-            "20px",
-            ";
-  }
-
-  @media (max-width: ",
-            "641px",
-            ") {
-    flex-direction: column;
-    div {
-      margin-bottom: ",
-            "10px",
-            ";
-      margin-right: 0;
-    }
-  }
-",
-          ],
-        },
-        "displayName": "styled.div",
-        "foldedComponentIds": Array [],
-        "render": [Function],
-        "styledComponentId": "sc-bdVaJa",
-        "target": "div",
-        "toString": [Function],
-        "warnTooManyClasses": [Function],
-        "withComponent": [Function],
-      },
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+<styled.div>
+  <styled.div>
+    <strong>
+      Appointment type
+    </strong>
+    <styled.div>
+      ACT
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Appointment location
+    </strong>
+    <styled.div>
+      GYM
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Date and time 
+    </strong>
+    <styled.div>
+      <div>
+        Wednesday
+      </div>
+      20/03/2019 - 21:00
+       
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Comments
+    </strong>
+    <styled.div>
+      test
+    </styled.div>
+  </styled.div>
+  <styled.div>
+    <strong>
+      Recurring
+    </strong>
+    <styled.div>
+      Daily
+      , 
+      5
+       occurrences
+    </styled.div>
+    <styled.div>
+      Ends 
+      Sunday, March 24th 2019
+    </styled.div>
+  </styled.div>
+</styled.div>
 `;
diff --git a/src/BulkAppointments/AddPrisoners/__snapshots__/AddPrisonersContainer.test.js.snap b/src/BulkAppointments/AddPrisoners/__snapshots__/AddPrisonersContainer.test.js.snap
index 253a65375..59e85226f 100644
--- a/src/BulkAppointments/AddPrisoners/__snapshots__/AddPrisonersContainer.test.js.snap
+++ b/src/BulkAppointments/AddPrisoners/__snapshots__/AddPrisonersContainer.test.js.snap
@@ -1,2823 +1,161 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Add prisoners container should pass props correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <AddPrisonerContainer
-    agencyId="LEI"
-    appointmentDetails={
-      Object {
-        "appointmentType": "ACC",
-        "appointmentTypeDescription": "Activities",
-        "comments": "test comment",
-        "counts": "2",
-        "locationDescription": "Gym",
-        "locationId": 1,
-        "recurring": true,
-        "repeats": "DAILY",
-        "startTime": "2019-10-10T:21:00:00Z",
-        "times": "1",
-      }
-    }
-    dispatchAppointmentPrisoners={[Function]}
-    dispatchBulkAppointmentsComplete={[Function]}
-    handleError={[Function]}
-    history={
-      Object {
-        "push": [MockFunction],
-        "replace": [MockFunction],
-      }
-    }
-    notmEndpointUrl="/"
-    now={"2019-10-10T21:00:00.000Z"}
-    prisoners={Array []}
-    raiseAnalyticsEvent={[Function]}
-    resetErrorDispatch={[Function]}
-    setLoadedDispatch={[Function]}
-    store={
-      Object {
-        "dispatch": [MockFunction] {
-          "calls": Array [
-            Array [
-              Object {
-                "loaded": true,
-                "type": "SET_LOADED",
-              },
-            ],
-            Array [
-              Object {
-                "type": "RESET_ERROR",
-              },
-            ],
-          ],
-        },
-        "getState": [MockFunction] {
-          "calls": Array [
-            Array [],
-            Array [],
-          ],
-        },
-        "subscribe": [MockFunction] {
-          "calls": Array [
-            Array [
-              [Function],
-            ],
-          ],
-        },
-      }
-    }
-    storeSubscription={
-      Subscription {
-        "listeners": Object {
-          "clear": [Function],
-          "get": [Function],
-          "notify": [Function],
-          "subscribe": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "dispatch": [MockFunction] {
-            "calls": Array [
-              Array [
-                Object {
-                  "loaded": true,
-                  "type": "SET_LOADED",
-                },
-              ],
-              Array [
-                Object {
-                  "type": "RESET_ERROR",
-                },
-              ],
-            ],
-          },
-          "getState": [MockFunction] {
-            "calls": Array [
-              Array [],
-              Array [],
-            ],
-          },
-          "subscribe": [MockFunction] {
-            "calls": Array [
-              Array [
-                [Function],
-              ],
-            ],
-          },
-        },
-        "unsubscribe": undefined,
-      }
-    }
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "class",
-    "props": Object {
-      "alwaysRender": true,
-      "children": Array [
-        false,
-        <UNDEFINED>
-          <p>
-             Upload the prison numbers for all prisoners attending the below appointment. 
-          </p>
-          <UNDEFINED>
-            <UNDEFINED />
-            <AppointmentDetails
-              appointmentType="ACC"
-              appointmentTypeDescription="Activities"
-              comments="test comment"
-              counts="2"
-              endTime=""
-              locationDescription="Gym"
-              locationId={1}
-              recurring={true}
-              repeats="DAILY"
-              startTime="2019-10-10T:21:00:00Z"
-              times="1"
-            />
-            <UNDEFINED />
-            <OffenderUpload
-              agencyId="LEI"
-              onCancel={[Function]}
-              onError={[Function]}
-              onSuccess={[Function]}
-              showCancelButton={true}
-            />
-            <UNDEFINED />
-            <AddPrisoners
-              appointment={
-                Object {
-                  "appointmentType": "ACC",
-                  "appointmentTypeDescription": "Activities",
-                  "comments": "test comment",
-                  "counts": "2",
-                  "locationDescription": "Gym",
-                  "locationId": 1,
-                  "recurring": true,
-                  "repeats": "DAILY",
-                  "startTime": "2019-10-10T:21:00:00Z",
-                  "times": "1",
-                }
-              }
-              date={null}
-              dispatchAppointmentPrisoners={[Function]}
-              error=""
-              now={"2019-10-10T21:00:00.000Z"}
-              offenders={Array []}
-              onCancel={[Function]}
-              onError={[Function]}
-              onSuccess={[Function]}
-              resetErrors={[Function]}
-              startTime="2019-10-10T:21:00:00Z"
-            />
-          </UNDEFINED>
-        </UNDEFINED>,
-      ],
-      "title": "Add prisoners",
-    },
-    "ref": null,
-    "rendered": Array [
-      false,
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <p>
-               Upload the prison numbers for all prisoners attending the below appointment. 
-            </p>,
-            <UNDEFINED>
-              <UNDEFINED />
-              <AppointmentDetails
-                appointmentType="ACC"
-                appointmentTypeDescription="Activities"
-                comments="test comment"
-                counts="2"
-                endTime=""
-                locationDescription="Gym"
-                locationId={1}
-                recurring={true}
-                repeats="DAILY"
-                startTime="2019-10-10T:21:00:00Z"
-                times="1"
-              />
-              <UNDEFINED />
-              <OffenderUpload
-                agencyId="LEI"
-                onCancel={[Function]}
-                onError={[Function]}
-                onSuccess={[Function]}
-                showCancelButton={true}
-              />
-              <UNDEFINED />
-              <AddPrisoners
-                appointment={
-                  Object {
-                    "appointmentType": "ACC",
-                    "appointmentTypeDescription": "Activities",
-                    "comments": "test comment",
-                    "counts": "2",
-                    "locationDescription": "Gym",
-                    "locationId": 1,
-                    "recurring": true,
-                    "repeats": "DAILY",
-                    "startTime": "2019-10-10T:21:00:00Z",
-                    "times": "1",
-                  }
-                }
-                date={null}
-                dispatchAppointmentPrisoners={[Function]}
-                error=""
-                now={"2019-10-10T21:00:00.000Z"}
-                offenders={Array []}
-                onCancel={[Function]}
-                onError={[Function]}
-                onSuccess={[Function]}
-                resetErrors={[Function]}
-                startTime="2019-10-10T:21:00:00Z"
-              />
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": " Upload the prison numbers for all prisoners attending the below appointment. ",
-            },
-            "ref": null,
-            "rendered": " Upload the prison numbers for all prisoners attending the below appointment. ",
-            "type": "p",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <UNDEFINED />,
-                <AppointmentDetails
-                  appointmentType="ACC"
-                  appointmentTypeDescription="Activities"
-                  comments="test comment"
-                  counts="2"
-                  endTime=""
-                  locationDescription="Gym"
-                  locationId={1}
-                  recurring={true}
-                  repeats="DAILY"
-                  startTime="2019-10-10T:21:00:00Z"
-                  times="1"
-                />,
-                <UNDEFINED />,
-                <OffenderUpload
-                  agencyId="LEI"
-                  onCancel={[Function]}
-                  onError={[Function]}
-                  onSuccess={[Function]}
-                  showCancelButton={true}
-                />,
-                <UNDEFINED />,
-                <AddPrisoners
-                  appointment={
-                    Object {
-                      "appointmentType": "ACC",
-                      "appointmentTypeDescription": "Activities",
-                      "comments": "test comment",
-                      "counts": "2",
-                      "locationDescription": "Gym",
-                      "locationId": 1,
-                      "recurring": true,
-                      "repeats": "DAILY",
-                      "startTime": "2019-10-10T:21:00:00Z",
-                      "times": "1",
-                    }
-                  }
-                  date={null}
-                  dispatchAppointmentPrisoners={[Function]}
-                  error=""
-                  now={"2019-10-10T21:00:00.000Z"}
-                  offenders={Array []}
-                  onCancel={[Function]}
-                  onError={[Function]}
-                  onSuccess={[Function]}
-                  resetErrors={[Function]}
-                  startTime="2019-10-10T:21:00:00Z"
-                />,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {},
-                "ref": null,
-                "rendered": null,
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "attrs": Array [],
-                  "componentStyle": ComponentStyle {
-                    "componentId": "sc-gqjmRU",
-                    "isStatic": true,
-                    "rules": Array [
-                      "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                      "30px",
-                      ";
-  margin-top: ",
-                      "10px",
-                      ";
-",
-                    ],
-                  },
-                  "displayName": "styled.div",
-                  "foldedComponentIds": Array [],
-                  "render": [Function],
-                  "styledComponentId": "sc-gqjmRU",
-                  "target": "div",
-                  "toString": [Function],
-                  "warnTooManyClasses": [Function],
-                  "withComponent": [Function],
-                },
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "appointmentType": "ACC",
-                  "appointmentTypeDescription": "Activities",
-                  "comments": "test comment",
-                  "counts": "2",
-                  "endTime": "",
-                  "locationDescription": "Gym",
-                  "locationId": 1,
-                  "recurring": true,
-                  "repeats": "DAILY",
-                  "startTime": "2019-10-10T:21:00:00Z",
-                  "times": "1",
-                },
-                "ref": null,
-                "rendered": null,
-                "type": [Function],
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {},
-                "ref": null,
-                "rendered": null,
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "attrs": Array [],
-                  "componentStyle": ComponentStyle {
-                    "componentId": "sc-gqjmRU",
-                    "isStatic": true,
-                    "rules": Array [
-                      "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                      "30px",
-                      ";
-  margin-top: ",
-                      "10px",
-                      ";
-",
-                    ],
-                  },
-                  "displayName": "styled.div",
-                  "foldedComponentIds": Array [],
-                  "render": [Function],
-                  "styledComponentId": "sc-gqjmRU",
-                  "target": "div",
-                  "toString": [Function],
-                  "warnTooManyClasses": [Function],
-                  "withComponent": [Function],
-                },
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "agencyId": "LEI",
-                  "onCancel": [Function],
-                  "onError": [Function],
-                  "onSuccess": [Function],
-                  "showCancelButton": true,
-                },
-                "ref": null,
-                "rendered": null,
-                "type": [Function],
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {},
-                "ref": null,
-                "rendered": null,
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "attrs": Array [],
-                  "componentStyle": ComponentStyle {
-                    "componentId": "sc-gqjmRU",
-                    "isStatic": true,
-                    "rules": Array [
-                      "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                      "30px",
-                      ";
-  margin-top: ",
-                      "10px",
-                      ";
-",
-                    ],
-                  },
-                  "displayName": "styled.div",
-                  "foldedComponentIds": Array [],
-                  "render": [Function],
-                  "styledComponentId": "sc-gqjmRU",
-                  "target": "div",
-                  "toString": [Function],
-                  "warnTooManyClasses": [Function],
-                  "withComponent": [Function],
-                },
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "appointment": Object {
-                    "appointmentType": "ACC",
-                    "appointmentTypeDescription": "Activities",
-                    "comments": "test comment",
-                    "counts": "2",
-                    "locationDescription": "Gym",
-                    "locationId": 1,
-                    "recurring": true,
-                    "repeats": "DAILY",
-                    "startTime": "2019-10-10T:21:00:00Z",
-                    "times": "1",
-                  },
-                  "date": null,
-                  "dispatchAppointmentPrisoners": [Function],
-                  "error": "",
-                  "now": "2019-10-10T21:00:00.000Z",
-                  "offenders": Array [],
-                  "onCancel": [Function],
-                  "onError": [Function],
-                  "onSuccess": [Function],
-                  "resetErrors": [Function],
-                  "startTime": "2019-10-10T:21:00:00Z",
-                },
-                "ref": null,
-                "rendered": null,
-                "type": [Function],
-              },
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-gZMcBi",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  margin-top: ",
-                  "30px",
-                  ";
-
-  button {
-    margin-top: ",
-                  "30px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-gZMcBi",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": Symbol(react.fragment),
-      },
-    ],
-    "type": [Function],
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "class",
-      "props": Object {
-        "alwaysRender": true,
-        "children": Array [
-          false,
-          <UNDEFINED>
-            <p>
-               Upload the prison numbers for all prisoners attending the below appointment. 
-            </p>
-            <UNDEFINED>
-              <UNDEFINED />
-              <AppointmentDetails
-                appointmentType="ACC"
-                appointmentTypeDescription="Activities"
-                comments="test comment"
-                counts="2"
-                endTime=""
-                locationDescription="Gym"
-                locationId={1}
-                recurring={true}
-                repeats="DAILY"
-                startTime="2019-10-10T:21:00:00Z"
-                times="1"
-              />
-              <UNDEFINED />
-              <OffenderUpload
-                agencyId="LEI"
-                onCancel={[Function]}
-                onError={[Function]}
-                onSuccess={[Function]}
-                showCancelButton={true}
-              />
-              <UNDEFINED />
-              <AddPrisoners
-                appointment={
-                  Object {
-                    "appointmentType": "ACC",
-                    "appointmentTypeDescription": "Activities",
-                    "comments": "test comment",
-                    "counts": "2",
-                    "locationDescription": "Gym",
-                    "locationId": 1,
-                    "recurring": true,
-                    "repeats": "DAILY",
-                    "startTime": "2019-10-10T:21:00:00Z",
-                    "times": "1",
-                  }
-                }
-                date={null}
-                dispatchAppointmentPrisoners={[Function]}
-                error=""
-                now={"2019-10-10T21:00:00.000Z"}
-                offenders={Array []}
-                onCancel={[Function]}
-                onError={[Function]}
-                onSuccess={[Function]}
-                resetErrors={[Function]}
-                startTime="2019-10-10T:21:00:00Z"
-              />
-            </UNDEFINED>
-          </UNDEFINED>,
-        ],
-        "title": "Add prisoners",
-      },
-      "ref": null,
-      "rendered": Array [
-        false,
+<Connect(Page)
+  alwaysRender={true}
+  title="Add prisoners"
+>
+  <p>
+     Upload the prison numbers for all prisoners attending the below appointment. 
+  </p>
+  <styled.div>
+    <styled.div />
+    <AppointmentDetails
+      appointmentType="ACC"
+      appointmentTypeDescription="Activities"
+      comments="test comment"
+      counts="2"
+      endTime=""
+      locationDescription="Gym"
+      locationId={1}
+      recurring={true}
+      repeats="DAILY"
+      startTime="2019-10-10T:21:00:00Z"
+      times="1"
+    />
+    <styled.div />
+    <OffenderUpload
+      agencyId="LEI"
+      onCancel={[Function]}
+      onError={[Function]}
+      onSuccess={[Function]}
+      showCancelButton={true}
+    />
+    <styled.div />
+    <AddPrisoners
+      appointment={
         Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <p>
-                 Upload the prison numbers for all prisoners attending the below appointment. 
-              </p>,
-              <UNDEFINED>
-                <UNDEFINED />
-                <AppointmentDetails
-                  appointmentType="ACC"
-                  appointmentTypeDescription="Activities"
-                  comments="test comment"
-                  counts="2"
-                  endTime=""
-                  locationDescription="Gym"
-                  locationId={1}
-                  recurring={true}
-                  repeats="DAILY"
-                  startTime="2019-10-10T:21:00:00Z"
-                  times="1"
-                />
-                <UNDEFINED />
-                <OffenderUpload
-                  agencyId="LEI"
-                  onCancel={[Function]}
-                  onError={[Function]}
-                  onSuccess={[Function]}
-                  showCancelButton={true}
-                />
-                <UNDEFINED />
-                <AddPrisoners
-                  appointment={
-                    Object {
-                      "appointmentType": "ACC",
-                      "appointmentTypeDescription": "Activities",
-                      "comments": "test comment",
-                      "counts": "2",
-                      "locationDescription": "Gym",
-                      "locationId": 1,
-                      "recurring": true,
-                      "repeats": "DAILY",
-                      "startTime": "2019-10-10T:21:00:00Z",
-                      "times": "1",
-                    }
-                  }
-                  date={null}
-                  dispatchAppointmentPrisoners={[Function]}
-                  error=""
-                  now={"2019-10-10T21:00:00.000Z"}
-                  offenders={Array []}
-                  onCancel={[Function]}
-                  onError={[Function]}
-                  onSuccess={[Function]}
-                  resetErrors={[Function]}
-                  startTime="2019-10-10T:21:00:00Z"
-                />
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": " Upload the prison numbers for all prisoners attending the below appointment. ",
-              },
-              "ref": null,
-              "rendered": " Upload the prison numbers for all prisoners attending the below appointment. ",
-              "type": "p",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <UNDEFINED />,
-                  <AppointmentDetails
-                    appointmentType="ACC"
-                    appointmentTypeDescription="Activities"
-                    comments="test comment"
-                    counts="2"
-                    endTime=""
-                    locationDescription="Gym"
-                    locationId={1}
-                    recurring={true}
-                    repeats="DAILY"
-                    startTime="2019-10-10T:21:00:00Z"
-                    times="1"
-                  />,
-                  <UNDEFINED />,
-                  <OffenderUpload
-                    agencyId="LEI"
-                    onCancel={[Function]}
-                    onError={[Function]}
-                    onSuccess={[Function]}
-                    showCancelButton={true}
-                  />,
-                  <UNDEFINED />,
-                  <AddPrisoners
-                    appointment={
-                      Object {
-                        "appointmentType": "ACC",
-                        "appointmentTypeDescription": "Activities",
-                        "comments": "test comment",
-                        "counts": "2",
-                        "locationDescription": "Gym",
-                        "locationId": 1,
-                        "recurring": true,
-                        "repeats": "DAILY",
-                        "startTime": "2019-10-10T:21:00:00Z",
-                        "times": "1",
-                      }
-                    }
-                    date={null}
-                    dispatchAppointmentPrisoners={[Function]}
-                    error=""
-                    now={"2019-10-10T21:00:00.000Z"}
-                    offenders={Array []}
-                    onCancel={[Function]}
-                    onError={[Function]}
-                    onSuccess={[Function]}
-                    resetErrors={[Function]}
-                    startTime="2019-10-10T:21:00:00Z"
-                  />,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {},
-                  "ref": null,
-                  "rendered": null,
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "attrs": Array [],
-                    "componentStyle": ComponentStyle {
-                      "componentId": "sc-gqjmRU",
-                      "isStatic": true,
-                      "rules": Array [
-                        "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                        "30px",
-                        ";
-  margin-top: ",
-                        "10px",
-                        ";
-",
-                      ],
-                    },
-                    "displayName": "styled.div",
-                    "foldedComponentIds": Array [],
-                    "render": [Function],
-                    "styledComponentId": "sc-gqjmRU",
-                    "target": "div",
-                    "toString": [Function],
-                    "warnTooManyClasses": [Function],
-                    "withComponent": [Function],
-                  },
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "appointmentType": "ACC",
-                    "appointmentTypeDescription": "Activities",
-                    "comments": "test comment",
-                    "counts": "2",
-                    "endTime": "",
-                    "locationDescription": "Gym",
-                    "locationId": 1,
-                    "recurring": true,
-                    "repeats": "DAILY",
-                    "startTime": "2019-10-10T:21:00:00Z",
-                    "times": "1",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": [Function],
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {},
-                  "ref": null,
-                  "rendered": null,
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "attrs": Array [],
-                    "componentStyle": ComponentStyle {
-                      "componentId": "sc-gqjmRU",
-                      "isStatic": true,
-                      "rules": Array [
-                        "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                        "30px",
-                        ";
-  margin-top: ",
-                        "10px",
-                        ";
-",
-                      ],
-                    },
-                    "displayName": "styled.div",
-                    "foldedComponentIds": Array [],
-                    "render": [Function],
-                    "styledComponentId": "sc-gqjmRU",
-                    "target": "div",
-                    "toString": [Function],
-                    "warnTooManyClasses": [Function],
-                    "withComponent": [Function],
-                  },
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "agencyId": "LEI",
-                    "onCancel": [Function],
-                    "onError": [Function],
-                    "onSuccess": [Function],
-                    "showCancelButton": true,
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": [Function],
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {},
-                  "ref": null,
-                  "rendered": null,
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "attrs": Array [],
-                    "componentStyle": ComponentStyle {
-                      "componentId": "sc-gqjmRU",
-                      "isStatic": true,
-                      "rules": Array [
-                        "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                        "30px",
-                        ";
-  margin-top: ",
-                        "10px",
-                        ";
-",
-                      ],
-                    },
-                    "displayName": "styled.div",
-                    "foldedComponentIds": Array [],
-                    "render": [Function],
-                    "styledComponentId": "sc-gqjmRU",
-                    "target": "div",
-                    "toString": [Function],
-                    "warnTooManyClasses": [Function],
-                    "withComponent": [Function],
-                  },
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "appointment": Object {
-                      "appointmentType": "ACC",
-                      "appointmentTypeDescription": "Activities",
-                      "comments": "test comment",
-                      "counts": "2",
-                      "locationDescription": "Gym",
-                      "locationId": 1,
-                      "recurring": true,
-                      "repeats": "DAILY",
-                      "startTime": "2019-10-10T:21:00:00Z",
-                      "times": "1",
-                    },
-                    "date": null,
-                    "dispatchAppointmentPrisoners": [Function],
-                    "error": "",
-                    "now": "2019-10-10T21:00:00.000Z",
-                    "offenders": Array [],
-                    "onCancel": [Function],
-                    "onError": [Function],
-                    "onSuccess": [Function],
-                    "resetErrors": [Function],
-                    "startTime": "2019-10-10T:21:00:00Z",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": [Function],
-                },
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-gZMcBi",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  margin-top: ",
-                    "30px",
-                    ";
-
-  button {
-    margin-top: ",
-                    "30px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-gZMcBi",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": Symbol(react.fragment),
-        },
-      ],
-      "type": [Function],
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-    "context": Object {
-      "storeSubscription": undefined,
-    },
-  },
-  Symbol(enzyme.__childContext__): null,
-}
+          "appointmentType": "ACC",
+          "appointmentTypeDescription": "Activities",
+          "comments": "test comment",
+          "counts": "2",
+          "locationDescription": "Gym",
+          "locationId": 1,
+          "recurring": true,
+          "repeats": "DAILY",
+          "startTime": "2019-10-10T:21:00:00Z",
+          "times": "1",
+        }
+      }
+      date={null}
+      dispatchAppointmentPrisoners={[Function]}
+      error=""
+      now={"2019-10-10T21:00:00.000Z"}
+      offenders={Array []}
+      onCancel={[Function]}
+      onError={[Function]}
+      onSuccess={[Function]}
+      resetErrors={[Function]}
+      startTime="2019-10-10T:21:00:00Z"
+    />
+  </styled.div>
+</Connect(Page)>
 `;
 
 exports[`Add prisoners container should render completed view 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <AddPrisonerContainer
-    agencyId="LEI"
-    appointmentDetails={
-      Object {
-        "appointmentType": "ACC",
-        "appointmentTypeDescription": "Activities",
-        "comments": "test comment",
-        "counts": "2",
-        "locationDescription": "Gym",
-        "locationId": 1,
-        "recurring": false,
-        "repeats": "DAILY",
-        "startTime": "2019-10-10T:21:00:00Z",
-        "times": "1",
-      }
-    }
-    dispatchAppointmentPrisoners={[Function]}
-    dispatchBulkAppointmentsComplete={[Function]}
-    handleError={[Function]}
-    history={
-      Object {
-        "push": [MockFunction],
-        "replace": [MockFunction],
-      }
-    }
-    notmEndpointUrl="/"
-    now={"2019-10-10T21:00:00.000Z"}
-    prisoners={Array []}
-    raiseAnalyticsEvent={[Function]}
-    resetErrorDispatch={[Function]}
-    setLoadedDispatch={[Function]}
-    store={
-      Object {
-        "dispatch": [MockFunction] {
-          "calls": Array [
-            Array [
-              Object {
-                "loaded": true,
-                "type": "SET_LOADED",
-              },
-            ],
-            Array [
-              Object {
-                "type": "RESET_ERROR",
-              },
-            ],
-            Array [
-              Object {
-                "type": "SET_BULK_APPOINTMENTS_COMPLETE",
-              },
-            ],
-          ],
-        },
-        "getState": [MockFunction] {
-          "calls": Array [
-            Array [],
-            Array [],
-          ],
-        },
-        "subscribe": [MockFunction] {
-          "calls": Array [
-            Array [
-              [Function],
-            ],
-          ],
-        },
-      }
-    }
-    storeSubscription={
-      Subscription {
-        "listeners": Object {
-          "clear": [Function],
-          "get": [Function],
-          "notify": [Function],
-          "subscribe": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "dispatch": [MockFunction] {
-            "calls": Array [
-              Array [
-                Object {
-                  "loaded": true,
-                  "type": "SET_LOADED",
-                },
-              ],
-              Array [
-                Object {
-                  "type": "RESET_ERROR",
-                },
-              ],
-              Array [
-                Object {
-                  "type": "SET_BULK_APPOINTMENTS_COMPLETE",
-                },
-              ],
-            ],
-          },
-          "getState": [MockFunction] {
-            "calls": Array [
-              Array [],
-              Array [],
-            ],
-          },
-          "subscribe": [MockFunction] {
-            "calls": Array [
-              Array [
-                [Function],
-              ],
-            ],
-          },
-        },
-        "unsubscribe": undefined,
-      }
-    }
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "class",
-    "props": Object {
-      "alwaysRender": true,
-      "children": Array [
-        <withRouter(ScrollToTop)
-          always={true}
-        >
-          <H3>
-             
-            2
-             appointments created 
-          </H3>
-          <UNDEFINED />
-          <AppointmentDetails
-            appointmentType="ACC"
-            appointmentTypeDescription="Activities"
-            comments="test comment"
-            counts="2"
-            endTime=""
-            locationDescription="Gym"
-            locationId={1}
-            recurring={false}
-            repeats="DAILY"
-            startTime="2019-10-10T:21:00:00Z"
-            times="1"
-          />
-          <UNDEFINED />
-          <UNDEFINED>
-            <UNDEFINED
-              buttonColour={undefined}
-              buttonHoverColour={undefined}
-              buttonShadowColour={undefined}
-              buttonTextColour={undefined}
-              disabled={false}
-              icon={undefined}
-              onClick={[Function]}
-              start={false}
-            >
-              Add another appointment
-            </UNDEFINED>
-            <UNDEFINED
-              buttonColour="#dee0e2"
-              buttonHoverColour={undefined}
-              buttonShadowColour={undefined}
-              buttonTextColour="#0b0c0c"
-              disabled={false}
-              icon={undefined}
-              onClick={[Function]}
-              start={false}
-            >
-              Back to home page
-            </UNDEFINED>
-          </UNDEFINED>
-        </withRouter(ScrollToTop)>,
-        false,
-      ],
-      "title": "Add prisoners",
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "always": true,
-          "children": Array [
-            <H3>
-               
-              2
-               appointments created 
-            </H3>,
-            <UNDEFINED />,
-            <AppointmentDetails
-              appointmentType="ACC"
-              appointmentTypeDescription="Activities"
-              comments="test comment"
-              counts="2"
-              endTime=""
-              locationDescription="Gym"
-              locationId={1}
-              recurring={false}
-              repeats="DAILY"
-              startTime="2019-10-10T:21:00:00Z"
-              times="1"
-            />,
-            <UNDEFINED />,
-            <UNDEFINED>
-              <UNDEFINED
-                buttonColour={undefined}
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour={undefined}
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Add another appointment
-              </UNDEFINED>
-              <UNDEFINED
-                buttonColour="#dee0e2"
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour="#0b0c0c"
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Back to home page
-              </UNDEFINED>
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                " ",
-                2,
-                " appointments created ",
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              " ",
-              2,
-              " appointments created ",
-            ],
-            "type": [Function],
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {},
-            "ref": null,
-            "rendered": null,
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-gqjmRU",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                  "30px",
-                  ";
-  margin-top: ",
-                  "10px",
-                  ";
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-gqjmRU",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "appointmentType": "ACC",
-              "appointmentTypeDescription": "Activities",
-              "comments": "test comment",
-              "counts": "2",
-              "endTime": "",
-              "locationDescription": "Gym",
-              "locationId": 1,
-              "recurring": false,
-              "repeats": "DAILY",
-              "startTime": "2019-10-10T:21:00:00Z",
-              "times": "1",
-            },
-            "ref": null,
-            "rendered": null,
-            "type": [Function],
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {},
-            "ref": null,
-            "rendered": null,
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-gqjmRU",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                  "30px",
-                  ";
-  margin-top: ",
-                  "10px",
-                  ";
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-gqjmRU",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <UNDEFINED
-                  buttonColour={undefined}
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour={undefined}
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Add another appointment
-                </UNDEFINED>,
-                <UNDEFINED
-                  buttonColour="#dee0e2"
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour="#0b0c0c"
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Back to home page
-                </UNDEFINED>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "buttonColour": undefined,
-                  "buttonHoverColour": undefined,
-                  "buttonShadowColour": undefined,
-                  "buttonTextColour": undefined,
-                  "children": "Add another appointment",
-                  "disabled": false,
-                  "icon": undefined,
-                  "onClick": [Function],
-                  "start": false,
-                },
-                "ref": null,
-                "rendered": "Add another appointment",
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "defaultProps": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "disabled": false,
-                    "icon": undefined,
-                    "start": false,
-                  },
-                  "propTypes": Object {
-                    "buttonColour": [Function],
-                    "buttonHoverColour": [Function],
-                    "buttonShadowColour": [Function],
-                    "buttonTextColour": [Function],
-                    "children": [Function],
-                    "disabled": [Function],
-                    "icon": [Function],
-                    "start": [Function],
-                  },
-                  "render": [Function],
-                },
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "buttonColour": "#dee0e2",
-                  "buttonHoverColour": undefined,
-                  "buttonShadowColour": undefined,
-                  "buttonTextColour": "#0b0c0c",
-                  "children": "Back to home page",
-                  "disabled": false,
-                  "icon": undefined,
-                  "onClick": [Function],
-                  "start": false,
-                },
-                "ref": null,
-                "rendered": "Back to home page",
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "defaultProps": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "disabled": false,
-                    "icon": undefined,
-                    "start": false,
-                  },
-                  "propTypes": Object {
-                    "buttonColour": [Function],
-                    "buttonHoverColour": [Function],
-                    "buttonShadowColour": [Function],
-                    "buttonTextColour": [Function],
-                    "children": [Function],
-                    "disabled": [Function],
-                    "icon": [Function],
-                    "start": [Function],
-                  },
-                  "render": [Function],
-                },
-              },
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-VigVT",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  display: flex;
-  flex-direction: row;
-  button {
-    margin-right: ",
-                  "10px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-VigVT",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": [Function],
-      },
-      false,
-    ],
-    "type": [Function],
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "class",
-      "props": Object {
-        "alwaysRender": true,
-        "children": Array [
-          <withRouter(ScrollToTop)
-            always={true}
-          >
-            <H3>
-               
-              2
-               appointments created 
-            </H3>
-            <UNDEFINED />
-            <AppointmentDetails
-              appointmentType="ACC"
-              appointmentTypeDescription="Activities"
-              comments="test comment"
-              counts="2"
-              endTime=""
-              locationDescription="Gym"
-              locationId={1}
-              recurring={false}
-              repeats="DAILY"
-              startTime="2019-10-10T:21:00:00Z"
-              times="1"
-            />
-            <UNDEFINED />
-            <UNDEFINED>
-              <UNDEFINED
-                buttonColour={undefined}
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour={undefined}
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Add another appointment
-              </UNDEFINED>
-              <UNDEFINED
-                buttonColour="#dee0e2"
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour="#0b0c0c"
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Back to home page
-              </UNDEFINED>
-            </UNDEFINED>
-          </withRouter(ScrollToTop)>,
-          false,
-        ],
-        "title": "Add prisoners",
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "always": true,
-            "children": Array [
-              <H3>
-                 
-                2
-                 appointments created 
-              </H3>,
-              <UNDEFINED />,
-              <AppointmentDetails
-                appointmentType="ACC"
-                appointmentTypeDescription="Activities"
-                comments="test comment"
-                counts="2"
-                endTime=""
-                locationDescription="Gym"
-                locationId={1}
-                recurring={false}
-                repeats="DAILY"
-                startTime="2019-10-10T:21:00:00Z"
-                times="1"
-              />,
-              <UNDEFINED />,
-              <UNDEFINED>
-                <UNDEFINED
-                  buttonColour={undefined}
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour={undefined}
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Add another appointment
-                </UNDEFINED>
-                <UNDEFINED
-                  buttonColour="#dee0e2"
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour="#0b0c0c"
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Back to home page
-                </UNDEFINED>
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  " ",
-                  2,
-                  " appointments created ",
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                " ",
-                2,
-                " appointments created ",
-              ],
-              "type": [Function],
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {},
-              "ref": null,
-              "rendered": null,
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-gqjmRU",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                    "30px",
-                    ";
-  margin-top: ",
-                    "10px",
-                    ";
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-gqjmRU",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "appointmentType": "ACC",
-                "appointmentTypeDescription": "Activities",
-                "comments": "test comment",
-                "counts": "2",
-                "endTime": "",
-                "locationDescription": "Gym",
-                "locationId": 1,
-                "recurring": false,
-                "repeats": "DAILY",
-                "startTime": "2019-10-10T:21:00:00Z",
-                "times": "1",
-              },
-              "ref": null,
-              "rendered": null,
-              "type": [Function],
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {},
-              "ref": null,
-              "rendered": null,
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-gqjmRU",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                    "30px",
-                    ";
-  margin-top: ",
-                    "10px",
-                    ";
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-gqjmRU",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <UNDEFINED
-                    buttonColour={undefined}
-                    buttonHoverColour={undefined}
-                    buttonShadowColour={undefined}
-                    buttonTextColour={undefined}
-                    disabled={false}
-                    icon={undefined}
-                    onClick={[Function]}
-                    start={false}
-                  >
-                    Add another appointment
-                  </UNDEFINED>,
-                  <UNDEFINED
-                    buttonColour="#dee0e2"
-                    buttonHoverColour={undefined}
-                    buttonShadowColour={undefined}
-                    buttonTextColour="#0b0c0c"
-                    disabled={false}
-                    icon={undefined}
-                    onClick={[Function]}
-                    start={false}
-                  >
-                    Back to home page
-                  </UNDEFINED>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "children": "Add another appointment",
-                    "disabled": false,
-                    "icon": undefined,
-                    "onClick": [Function],
-                    "start": false,
-                  },
-                  "ref": null,
-                  "rendered": "Add another appointment",
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "defaultProps": Object {
-                      "buttonColour": undefined,
-                      "buttonHoverColour": undefined,
-                      "buttonShadowColour": undefined,
-                      "buttonTextColour": undefined,
-                      "disabled": false,
-                      "icon": undefined,
-                      "start": false,
-                    },
-                    "propTypes": Object {
-                      "buttonColour": [Function],
-                      "buttonHoverColour": [Function],
-                      "buttonShadowColour": [Function],
-                      "buttonTextColour": [Function],
-                      "children": [Function],
-                      "disabled": [Function],
-                      "icon": [Function],
-                      "start": [Function],
-                    },
-                    "render": [Function],
-                  },
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "buttonColour": "#dee0e2",
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": "#0b0c0c",
-                    "children": "Back to home page",
-                    "disabled": false,
-                    "icon": undefined,
-                    "onClick": [Function],
-                    "start": false,
-                  },
-                  "ref": null,
-                  "rendered": "Back to home page",
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "defaultProps": Object {
-                      "buttonColour": undefined,
-                      "buttonHoverColour": undefined,
-                      "buttonShadowColour": undefined,
-                      "buttonTextColour": undefined,
-                      "disabled": false,
-                      "icon": undefined,
-                      "start": false,
-                    },
-                    "propTypes": Object {
-                      "buttonColour": [Function],
-                      "buttonHoverColour": [Function],
-                      "buttonShadowColour": [Function],
-                      "buttonTextColour": [Function],
-                      "children": [Function],
-                      "disabled": [Function],
-                      "icon": [Function],
-                      "start": [Function],
-                    },
-                    "render": [Function],
-                  },
-                },
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-VigVT",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  display: flex;
-  flex-direction: row;
-  button {
-    margin-right: ",
-                    "10px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-VigVT",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": [Function],
-        },
-        false,
-      ],
-      "type": [Function],
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-    "context": Object {
-      "storeSubscription": undefined,
-    },
-  },
-  Symbol(enzyme.__childContext__): null,
-}
+<Connect(Page)
+  alwaysRender={true}
+  title="Add prisoners"
+>
+  <withRouter(ScrollToTop)
+    always={true}
+  >
+    <H3>
+       
+      2
+       appointments created 
+    </H3>
+    <styled.div />
+    <AppointmentDetails
+      appointmentType="ACC"
+      appointmentTypeDescription="Activities"
+      comments="test comment"
+      counts="2"
+      endTime=""
+      locationDescription="Gym"
+      locationId={1}
+      recurring={false}
+      repeats="DAILY"
+      startTime="2019-10-10T:21:00:00Z"
+      times="1"
+    />
+    <styled.div />
+    <styled.div>
+      <ForwardRef
+        disabled={false}
+        onClick={[Function]}
+        start={false}
+      >
+        Add another appointment
+      </ForwardRef>
+      <ForwardRef
+        buttonColour="#dee0e2"
+        buttonTextColour="#0b0c0c"
+        disabled={false}
+        onClick={[Function]}
+        start={false}
+      >
+        Back to home page
+      </ForwardRef>
+    </styled.div>
+  </withRouter(ScrollToTop)>
+</Connect(Page)>
 `;
 
 exports[`Add prisoners container should render completed view for recurring 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <AddPrisonerContainer
-    agencyId="LEI"
-    appointmentDetails={
-      Object {
-        "appointmentType": "ACC",
-        "appointmentTypeDescription": "Activities",
-        "comments": "test comment",
-        "counts": "2",
-        "locationDescription": "Gym",
-        "locationId": 1,
-        "recurring": true,
-        "repeats": "DAILY",
-        "startTime": "2019-10-10T:21:00:00Z",
-        "times": "1",
-      }
-    }
-    dispatchAppointmentPrisoners={[Function]}
-    dispatchBulkAppointmentsComplete={[Function]}
-    handleError={[Function]}
-    history={
-      Object {
-        "push": [MockFunction],
-        "replace": [MockFunction],
-      }
-    }
-    notmEndpointUrl="/"
-    now={"2019-10-10T21:00:00.000Z"}
-    prisoners={Array []}
-    raiseAnalyticsEvent={[Function]}
-    resetErrorDispatch={[Function]}
-    setLoadedDispatch={[Function]}
-    store={
-      Object {
-        "dispatch": [MockFunction] {
-          "calls": Array [
-            Array [
-              Object {
-                "loaded": true,
-                "type": "SET_LOADED",
-              },
-            ],
-            Array [
-              Object {
-                "type": "RESET_ERROR",
-              },
-            ],
-            Array [
-              Object {
-                "type": "SET_BULK_APPOINTMENTS_COMPLETE",
-              },
-            ],
-          ],
-        },
-        "getState": [MockFunction] {
-          "calls": Array [
-            Array [],
-            Array [],
-          ],
-        },
-        "subscribe": [MockFunction] {
-          "calls": Array [
-            Array [
-              [Function],
-            ],
-          ],
-        },
-      }
-    }
-    storeSubscription={
-      Subscription {
-        "listeners": Object {
-          "clear": [Function],
-          "get": [Function],
-          "notify": [Function],
-          "subscribe": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "dispatch": [MockFunction] {
-            "calls": Array [
-              Array [
-                Object {
-                  "loaded": true,
-                  "type": "SET_LOADED",
-                },
-              ],
-              Array [
-                Object {
-                  "type": "RESET_ERROR",
-                },
-              ],
-              Array [
-                Object {
-                  "type": "SET_BULK_APPOINTMENTS_COMPLETE",
-                },
-              ],
-            ],
-          },
-          "getState": [MockFunction] {
-            "calls": Array [
-              Array [],
-              Array [],
-            ],
-          },
-          "subscribe": [MockFunction] {
-            "calls": Array [
-              Array [
-                [Function],
-              ],
-            ],
-          },
-        },
-        "unsubscribe": undefined,
-      }
-    }
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "class",
-    "props": Object {
-      "alwaysRender": true,
-      "children": Array [
-        <withRouter(ScrollToTop)
-          always={true}
-        >
-          <H3>
-             Appointments created 
-          </H3>
-          <UNDEFINED />
-          <AppointmentDetails
-            appointmentType="ACC"
-            appointmentTypeDescription="Activities"
-            comments="test comment"
-            counts="2"
-            endTime=""
-            locationDescription="Gym"
-            locationId={1}
-            recurring={true}
-            repeats="DAILY"
-            startTime="2019-10-10T:21:00:00Z"
-            times="1"
-          />
-          <UNDEFINED />
-          <UNDEFINED>
-            <UNDEFINED
-              buttonColour={undefined}
-              buttonHoverColour={undefined}
-              buttonShadowColour={undefined}
-              buttonTextColour={undefined}
-              disabled={false}
-              icon={undefined}
-              onClick={[Function]}
-              start={false}
-            >
-              Add another appointment
-            </UNDEFINED>
-            <UNDEFINED
-              buttonColour="#dee0e2"
-              buttonHoverColour={undefined}
-              buttonShadowColour={undefined}
-              buttonTextColour="#0b0c0c"
-              disabled={false}
-              icon={undefined}
-              onClick={[Function]}
-              start={false}
-            >
-              Back to home page
-            </UNDEFINED>
-          </UNDEFINED>
-        </withRouter(ScrollToTop)>,
-        false,
-      ],
-      "title": "Add prisoners",
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "always": true,
-          "children": Array [
-            <H3>
-               Appointments created 
-            </H3>,
-            <UNDEFINED />,
-            <AppointmentDetails
-              appointmentType="ACC"
-              appointmentTypeDescription="Activities"
-              comments="test comment"
-              counts="2"
-              endTime=""
-              locationDescription="Gym"
-              locationId={1}
-              recurring={true}
-              repeats="DAILY"
-              startTime="2019-10-10T:21:00:00Z"
-              times="1"
-            />,
-            <UNDEFINED />,
-            <UNDEFINED>
-              <UNDEFINED
-                buttonColour={undefined}
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour={undefined}
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Add another appointment
-              </UNDEFINED>
-              <UNDEFINED
-                buttonColour="#dee0e2"
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour="#0b0c0c"
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Back to home page
-              </UNDEFINED>
-            </UNDEFINED>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": " Appointments created ",
-            },
-            "ref": null,
-            "rendered": " Appointments created ",
-            "type": [Function],
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {},
-            "ref": null,
-            "rendered": null,
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-gqjmRU",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                  "30px",
-                  ";
-  margin-top: ",
-                  "10px",
-                  ";
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-gqjmRU",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "appointmentType": "ACC",
-              "appointmentTypeDescription": "Activities",
-              "comments": "test comment",
-              "counts": "2",
-              "endTime": "",
-              "locationDescription": "Gym",
-              "locationId": 1,
-              "recurring": true,
-              "repeats": "DAILY",
-              "startTime": "2019-10-10T:21:00:00Z",
-              "times": "1",
-            },
-            "ref": null,
-            "rendered": null,
-            "type": [Function],
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {},
-            "ref": null,
-            "rendered": null,
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-gqjmRU",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                  "30px",
-                  ";
-  margin-top: ",
-                  "10px",
-                  ";
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-gqjmRU",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <UNDEFINED
-                  buttonColour={undefined}
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour={undefined}
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Add another appointment
-                </UNDEFINED>,
-                <UNDEFINED
-                  buttonColour="#dee0e2"
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour="#0b0c0c"
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Back to home page
-                </UNDEFINED>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "buttonColour": undefined,
-                  "buttonHoverColour": undefined,
-                  "buttonShadowColour": undefined,
-                  "buttonTextColour": undefined,
-                  "children": "Add another appointment",
-                  "disabled": false,
-                  "icon": undefined,
-                  "onClick": [Function],
-                  "start": false,
-                },
-                "ref": null,
-                "rendered": "Add another appointment",
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "defaultProps": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "disabled": false,
-                    "icon": undefined,
-                    "start": false,
-                  },
-                  "propTypes": Object {
-                    "buttonColour": [Function],
-                    "buttonHoverColour": [Function],
-                    "buttonShadowColour": [Function],
-                    "buttonTextColour": [Function],
-                    "children": [Function],
-                    "disabled": [Function],
-                    "icon": [Function],
-                    "start": [Function],
-                  },
-                  "render": [Function],
-                },
-              },
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "buttonColour": "#dee0e2",
-                  "buttonHoverColour": undefined,
-                  "buttonShadowColour": undefined,
-                  "buttonTextColour": "#0b0c0c",
-                  "children": "Back to home page",
-                  "disabled": false,
-                  "icon": undefined,
-                  "onClick": [Function],
-                  "start": false,
-                },
-                "ref": null,
-                "rendered": "Back to home page",
-                "type": Object {
-                  "$$typeof": Symbol(react.forward_ref),
-                  "defaultProps": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "disabled": false,
-                    "icon": undefined,
-                    "start": false,
-                  },
-                  "propTypes": Object {
-                    "buttonColour": [Function],
-                    "buttonHoverColour": [Function],
-                    "buttonShadowColour": [Function],
-                    "buttonTextColour": [Function],
-                    "children": [Function],
-                    "disabled": [Function],
-                    "icon": [Function],
-                    "start": [Function],
-                  },
-                  "render": [Function],
-                },
-              },
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-VigVT",
-                "isStatic": true,
-                "rules": Array [
-                  "
-  display: flex;
-  flex-direction: row;
-  button {
-    margin-right: ",
-                  "10px",
-                  ";
-  }
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-VigVT",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-        ],
-        "type": [Function],
-      },
-      false,
-    ],
-    "type": [Function],
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "class",
-      "props": Object {
-        "alwaysRender": true,
-        "children": Array [
-          <withRouter(ScrollToTop)
-            always={true}
-          >
-            <H3>
-               Appointments created 
-            </H3>
-            <UNDEFINED />
-            <AppointmentDetails
-              appointmentType="ACC"
-              appointmentTypeDescription="Activities"
-              comments="test comment"
-              counts="2"
-              endTime=""
-              locationDescription="Gym"
-              locationId={1}
-              recurring={true}
-              repeats="DAILY"
-              startTime="2019-10-10T:21:00:00Z"
-              times="1"
-            />
-            <UNDEFINED />
-            <UNDEFINED>
-              <UNDEFINED
-                buttonColour={undefined}
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour={undefined}
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Add another appointment
-              </UNDEFINED>
-              <UNDEFINED
-                buttonColour="#dee0e2"
-                buttonHoverColour={undefined}
-                buttonShadowColour={undefined}
-                buttonTextColour="#0b0c0c"
-                disabled={false}
-                icon={undefined}
-                onClick={[Function]}
-                start={false}
-              >
-                Back to home page
-              </UNDEFINED>
-            </UNDEFINED>
-          </withRouter(ScrollToTop)>,
-          false,
-        ],
-        "title": "Add prisoners",
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "always": true,
-            "children": Array [
-              <H3>
-                 Appointments created 
-              </H3>,
-              <UNDEFINED />,
-              <AppointmentDetails
-                appointmentType="ACC"
-                appointmentTypeDescription="Activities"
-                comments="test comment"
-                counts="2"
-                endTime=""
-                locationDescription="Gym"
-                locationId={1}
-                recurring={true}
-                repeats="DAILY"
-                startTime="2019-10-10T:21:00:00Z"
-                times="1"
-              />,
-              <UNDEFINED />,
-              <UNDEFINED>
-                <UNDEFINED
-                  buttonColour={undefined}
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour={undefined}
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Add another appointment
-                </UNDEFINED>
-                <UNDEFINED
-                  buttonColour="#dee0e2"
-                  buttonHoverColour={undefined}
-                  buttonShadowColour={undefined}
-                  buttonTextColour="#0b0c0c"
-                  disabled={false}
-                  icon={undefined}
-                  onClick={[Function]}
-                  start={false}
-                >
-                  Back to home page
-                </UNDEFINED>
-              </UNDEFINED>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": " Appointments created ",
-              },
-              "ref": null,
-              "rendered": " Appointments created ",
-              "type": [Function],
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {},
-              "ref": null,
-              "rendered": null,
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-gqjmRU",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                    "30px",
-                    ";
-  margin-top: ",
-                    "10px",
-                    ";
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-gqjmRU",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "appointmentType": "ACC",
-                "appointmentTypeDescription": "Activities",
-                "comments": "test comment",
-                "counts": "2",
-                "endTime": "",
-                "locationDescription": "Gym",
-                "locationId": 1,
-                "recurring": true,
-                "repeats": "DAILY",
-                "startTime": "2019-10-10T:21:00:00Z",
-                "times": "1",
-              },
-              "ref": null,
-              "rendered": null,
-              "type": [Function],
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {},
-              "ref": null,
-              "rendered": null,
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-gqjmRU",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  border: solid 1px #979797;
-  width: 100%;
-  margin-bottom: ",
-                    "30px",
-                    ";
-  margin-top: ",
-                    "10px",
-                    ";
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-gqjmRU",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <UNDEFINED
-                    buttonColour={undefined}
-                    buttonHoverColour={undefined}
-                    buttonShadowColour={undefined}
-                    buttonTextColour={undefined}
-                    disabled={false}
-                    icon={undefined}
-                    onClick={[Function]}
-                    start={false}
-                  >
-                    Add another appointment
-                  </UNDEFINED>,
-                  <UNDEFINED
-                    buttonColour="#dee0e2"
-                    buttonHoverColour={undefined}
-                    buttonShadowColour={undefined}
-                    buttonTextColour="#0b0c0c"
-                    disabled={false}
-                    icon={undefined}
-                    onClick={[Function]}
-                    start={false}
-                  >
-                    Back to home page
-                  </UNDEFINED>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "buttonColour": undefined,
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": undefined,
-                    "children": "Add another appointment",
-                    "disabled": false,
-                    "icon": undefined,
-                    "onClick": [Function],
-                    "start": false,
-                  },
-                  "ref": null,
-                  "rendered": "Add another appointment",
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "defaultProps": Object {
-                      "buttonColour": undefined,
-                      "buttonHoverColour": undefined,
-                      "buttonShadowColour": undefined,
-                      "buttonTextColour": undefined,
-                      "disabled": false,
-                      "icon": undefined,
-                      "start": false,
-                    },
-                    "propTypes": Object {
-                      "buttonColour": [Function],
-                      "buttonHoverColour": [Function],
-                      "buttonShadowColour": [Function],
-                      "buttonTextColour": [Function],
-                      "children": [Function],
-                      "disabled": [Function],
-                      "icon": [Function],
-                      "start": [Function],
-                    },
-                    "render": [Function],
-                  },
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "buttonColour": "#dee0e2",
-                    "buttonHoverColour": undefined,
-                    "buttonShadowColour": undefined,
-                    "buttonTextColour": "#0b0c0c",
-                    "children": "Back to home page",
-                    "disabled": false,
-                    "icon": undefined,
-                    "onClick": [Function],
-                    "start": false,
-                  },
-                  "ref": null,
-                  "rendered": "Back to home page",
-                  "type": Object {
-                    "$$typeof": Symbol(react.forward_ref),
-                    "defaultProps": Object {
-                      "buttonColour": undefined,
-                      "buttonHoverColour": undefined,
-                      "buttonShadowColour": undefined,
-                      "buttonTextColour": undefined,
-                      "disabled": false,
-                      "icon": undefined,
-                      "start": false,
-                    },
-                    "propTypes": Object {
-                      "buttonColour": [Function],
-                      "buttonHoverColour": [Function],
-                      "buttonShadowColour": [Function],
-                      "buttonTextColour": [Function],
-                      "children": [Function],
-                      "disabled": [Function],
-                      "icon": [Function],
-                      "start": [Function],
-                    },
-                    "render": [Function],
-                  },
-                },
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-VigVT",
-                  "isStatic": true,
-                  "rules": Array [
-                    "
-  display: flex;
-  flex-direction: row;
-  button {
-    margin-right: ",
-                    "10px",
-                    ";
-  }
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-VigVT",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-          ],
-          "type": [Function],
-        },
-        false,
-      ],
-      "type": [Function],
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-    "context": Object {
-      "storeSubscription": undefined,
-    },
-  },
-  Symbol(enzyme.__childContext__): null,
-}
+<Connect(Page)
+  alwaysRender={true}
+  title="Add prisoners"
+>
+  <withRouter(ScrollToTop)
+    always={true}
+  >
+    <H3>
+       Appointments created 
+    </H3>
+    <styled.div />
+    <AppointmentDetails
+      appointmentType="ACC"
+      appointmentTypeDescription="Activities"
+      comments="test comment"
+      counts="2"
+      endTime=""
+      locationDescription="Gym"
+      locationId={1}
+      recurring={true}
+      repeats="DAILY"
+      startTime="2019-10-10T:21:00:00Z"
+      times="1"
+    />
+    <styled.div />
+    <styled.div>
+      <ForwardRef
+        disabled={false}
+        onClick={[Function]}
+        start={false}
+      >
+        Add another appointment
+      </ForwardRef>
+      <ForwardRef
+        buttonColour="#dee0e2"
+        buttonTextColour="#0b0c0c"
+        disabled={false}
+        onClick={[Function]}
+        start={false}
+      >
+        Back to home page
+      </ForwardRef>
+    </styled.div>
+  </withRouter(ScrollToTop)>
+</Connect(Page)>
 `;
diff --git a/src/Components/NumericInput/__snapshots__/NumericInput.test.js.snap b/src/Components/NumericInput/__snapshots__/NumericInput.test.js.snap
index 2586902e9..2f3f59c68 100644
--- a/src/Components/NumericInput/__snapshots__/NumericInput.test.js.snap
+++ b/src/Components/NumericInput/__snapshots__/NumericInput.test.js.snap
@@ -1,554 +1,49 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`NumericInput should render correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <NumericInput
-    hint="Enter a value between 1 and 120"
-    input={
-      Object {
-        "name": "age",
-        "onChange": [Function],
-      }
-    }
-    label="Age"
-    meta={Object {}}
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <LabelText>
-           
-          Age
-           
-        </LabelText>,
-        <HintText>
-           
-          Enter a value between 1 and 120
-           
-        </HintText>,
-        undefined,
-        <UNDEFINED
-          error={undefined}
-          name="age"
-          onChange={[Function]}
-          type="number"
-        />,
-      ],
-      "error": false,
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            " ",
-            "Age",
-            " ",
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          " ",
-          "Age",
-          " ",
-        ],
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            " ",
-            "Enter a value between 1 and 120",
-            " ",
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          " ",
-          "Enter a value between 1 and 120",
-          " ",
-        ],
-        "type": [Function],
-      },
-      undefined,
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "error": undefined,
-          "name": "age",
-          "onChange": [Function],
-          "type": "number",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-EHOje",
-            "isStatic": true,
-            "rules": Array [
-              "
-  width: 65px;
-",
-            ],
-          },
-          "displayName": "Styled(Input)",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-EHOje",
-          "target": [Function],
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-          Symbol(Symbol.hasInstance): [Function],
-        },
-      },
-    ],
-    "type": [Function],
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <LabelText>
-             
-            Age
-             
-          </LabelText>,
-          <HintText>
-             
-            Enter a value between 1 and 120
-             
-          </HintText>,
-          undefined,
-          <UNDEFINED
-            error={undefined}
-            name="age"
-            onChange={[Function]}
-            type="number"
-          />,
-        ],
-        "error": false,
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              " ",
-              "Age",
-              " ",
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            " ",
-            "Age",
-            " ",
-          ],
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              " ",
-              "Enter a value between 1 and 120",
-              " ",
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            " ",
-            "Enter a value between 1 and 120",
-            " ",
-          ],
-          "type": [Function],
-        },
-        undefined,
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "error": undefined,
-            "name": "age",
-            "onChange": [Function],
-            "type": "number",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-EHOje",
-              "isStatic": true,
-              "rules": Array [
-                "
-  width: 65px;
-",
-              ],
-            },
-            "displayName": "Styled(Input)",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-EHOje",
-            "target": [Function],
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-            Symbol(Symbol.hasInstance): [Function],
-          },
-        },
-      ],
-      "type": [Function],
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+<Label
+  error={false}
+>
+  <LabelText>
+     
+    Age
+     
+  </LabelText>
+  <HintText>
+     
+    Enter a value between 1 and 120
+     
+  </HintText>
+  <Styled(Input)
+    name="age"
+    onChange={[Function]}
+    type="number"
+  />
+</Label>
 `;
 
 exports[`NumericInput should render with errors 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <NumericInput
-    hint="Enter a value between 1 and 120"
-    input={
-      Object {
-        "name": "age",
-        "onChange": [Function],
-      }
-    }
-    label="Age"
-    meta={
-      Object {
-        "error": "Please enter an age between 1 and 120",
-        "touched": true,
-      }
-    }
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <LabelText>
-           
-          Age
-           
-        </LabelText>,
-        <HintText>
-           
-          Enter a value between 1 and 120
-           
-        </HintText>,
-        <ErrorText>
-          Please enter an age between 1 and 120
-        </ErrorText>,
-        <UNDEFINED
-          error="Please enter an age between 1 and 120"
-          name="age"
-          onChange={[Function]}
-          type="number"
-        />,
-      ],
-      "error": "Please enter an age between 1 and 120",
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            " ",
-            "Age",
-            " ",
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          " ",
-          "Age",
-          " ",
-        ],
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            " ",
-            "Enter a value between 1 and 120",
-            " ",
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          " ",
-          "Enter a value between 1 and 120",
-          " ",
-        ],
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": "Please enter an age between 1 and 120",
-        },
-        "ref": null,
-        "rendered": "Please enter an age between 1 and 120",
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "error": "Please enter an age between 1 and 120",
-          "name": "age",
-          "onChange": [Function],
-          "type": "number",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-EHOje",
-            "isStatic": true,
-            "rules": Array [
-              "
-  width: 65px;
-",
-            ],
-          },
-          "displayName": "Styled(Input)",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-EHOje",
-          "target": [Function],
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-          Symbol(Symbol.hasInstance): [Function],
-        },
-      },
-    ],
-    "type": [Function],
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <LabelText>
-             
-            Age
-             
-          </LabelText>,
-          <HintText>
-             
-            Enter a value between 1 and 120
-             
-          </HintText>,
-          <ErrorText>
-            Please enter an age between 1 and 120
-          </ErrorText>,
-          <UNDEFINED
-            error="Please enter an age between 1 and 120"
-            name="age"
-            onChange={[Function]}
-            type="number"
-          />,
-        ],
-        "error": "Please enter an age between 1 and 120",
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              " ",
-              "Age",
-              " ",
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            " ",
-            "Age",
-            " ",
-          ],
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              " ",
-              "Enter a value between 1 and 120",
-              " ",
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            " ",
-            "Enter a value between 1 and 120",
-            " ",
-          ],
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": "Please enter an age between 1 and 120",
-          },
-          "ref": null,
-          "rendered": "Please enter an age between 1 and 120",
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "error": "Please enter an age between 1 and 120",
-            "name": "age",
-            "onChange": [Function],
-            "type": "number",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-EHOje",
-              "isStatic": true,
-              "rules": Array [
-                "
-  width: 65px;
-",
-              ],
-            },
-            "displayName": "Styled(Input)",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-EHOje",
-            "target": [Function],
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-            Symbol(Symbol.hasInstance): [Function],
-          },
-        },
-      ],
-      "type": [Function],
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+<Label
+  error="Please enter an age between 1 and 120"
+>
+  <LabelText>
+     
+    Age
+     
+  </LabelText>
+  <HintText>
+     
+    Enter a value between 1 and 120
+     
+  </HintText>
+  <ErrorText>
+    Please enter an age between 1 and 120
+  </ErrorText>
+  <Styled(Input)
+    error="Please enter an age between 1 and 120"
+    name="age"
+    onChange={[Function]}
+    type="number"
+  />
+</Label>
 `;
diff --git a/src/Components/Page/__snapshots__/Page.test.js.snap b/src/Components/Page/__snapshots__/Page.test.js.snap
index 0d719ca4a..36d59d677 100644
--- a/src/Components/Page/__snapshots__/Page.test.js.snap
+++ b/src/Components/Page/__snapshots__/Page.test.js.snap
@@ -1,442 +1,29 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<Page /> when there is an error should display spinner and contents 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <Page
-    alwaysRender={true}
-    applicationTitle=""
-    backLink="http://this/"
-    defaultHome="http://notmhome/"
-    dispatchApplicationTitle={[Function]}
-    error=""
+<Fragment>
+  <Spinner />
+  <withRouter()
     homeLink="http://home/"
-    loaded={false}
-    showBreadcrumb={true}
-    showPrint={false}
-    title="Page title"
+  />
+  <BackLink
+    href="http://this/"
   >
-    Page content
-  </Page>,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <Spinner />,
-        <withRouter()
-          homeLink="http://home/"
-        />,
-        <BackLink
-          href="http://this/"
-          onClick={undefined}
-        >
-          Back
-        </BackLink>,
-        <UNDEFINED>
-          <UNDEFINED>
-            <H1
-              size="LARGE"
-            >
-              Page title
-            </H1>
-          </UNDEFINED>
-          
-          <div
-            className="page-content"
-          >
-            Page content
-          </div>
-        </UNDEFINED>,
-        false,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "class",
-        "props": Object {},
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "homeLink": "http://home/",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": "Back",
-          "href": "http://this/",
-          "onClick": undefined,
-        },
-        "ref": null,
-        "rendered": "Back",
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "children": Array [
-            <UNDEFINED>
-              <H1
-                size="LARGE"
-              >
-                Page title
-              </H1>
-            </UNDEFINED>,
-            "",
-            <div
-              className="page-content"
-            >
-              Page content
-            </div>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "function",
-            "props": Object {
-              "children": Array [
-                <H1
-                  size="LARGE"
-                >
-                  Page title
-                </H1>,
-                false,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "function",
-                "props": Object {
-                  "children": "Page title",
-                  "size": "LARGE",
-                },
-                "ref": null,
-                "rendered": "Page title",
-                "type": [Function],
-              },
-              false,
-            ],
-            "type": Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "attrs": Array [],
-              "componentStyle": ComponentStyle {
-                "componentId": "sc-ifAKCX",
-                "isStatic": true,
-                "lastClassName": "fOGIFb",
-                "rules": Array [
-                  "
-  display: flex;
-  justify-content: space-between;
-",
-                ],
-              },
-              "displayName": "styled.div",
-              "foldedComponentIds": Array [],
-              "render": [Function],
-              "styledComponentId": "sc-ifAKCX",
-              "target": "div",
-              "toString": [Function],
-              "warnTooManyClasses": [Function],
-              "withComponent": [Function],
-            },
-          },
-          "",
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": "Page content",
-              "className": "page-content",
-            },
-            "ref": null,
-            "rendered": "Page content",
-            "type": "div",
-          },
-        ],
-        "type": Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "attrs": Array [],
-          "componentStyle": ComponentStyle {
-            "componentId": "sc-bxivhb",
-            "isStatic": true,
-            "lastClassName": "hWZXLf",
-            "rules": Array [
-              "
-  padding-top: ",
-              "20px",
-              ";
-  @media print {
-    padding-top: 0;
-  }
-",
-            ],
-          },
-          "displayName": "styled.div",
-          "foldedComponentIds": Array [],
-          "render": [Function],
-          "styledComponentId": "sc-bxivhb",
-          "target": "div",
-          "toString": [Function],
-          "warnTooManyClasses": [Function],
-          "withComponent": [Function],
-        },
-      },
-      false,
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <Spinner />,
-          <withRouter()
-            homeLink="http://home/"
-          />,
-          <BackLink
-            href="http://this/"
-            onClick={undefined}
-          >
-            Back
-          </BackLink>,
-          <UNDEFINED>
-            <UNDEFINED>
-              <H1
-                size="LARGE"
-              >
-                Page title
-              </H1>
-            </UNDEFINED>
-            
-            <div
-              className="page-content"
-            >
-              Page content
-            </div>
-          </UNDEFINED>,
-          false,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "class",
-          "props": Object {},
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "homeLink": "http://home/",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": "Back",
-            "href": "http://this/",
-            "onClick": undefined,
-          },
-          "ref": null,
-          "rendered": "Back",
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "children": Array [
-              <UNDEFINED>
-                <H1
-                  size="LARGE"
-                >
-                  Page title
-                </H1>
-              </UNDEFINED>,
-              "",
-              <div
-                className="page-content"
-              >
-                Page content
-              </div>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "function",
-              "props": Object {
-                "children": Array [
-                  <H1
-                    size="LARGE"
-                  >
-                    Page title
-                  </H1>,
-                  false,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "function",
-                  "props": Object {
-                    "children": "Page title",
-                    "size": "LARGE",
-                  },
-                  "ref": null,
-                  "rendered": "Page title",
-                  "type": [Function],
-                },
-                false,
-              ],
-              "type": Object {
-                "$$typeof": Symbol(react.forward_ref),
-                "attrs": Array [],
-                "componentStyle": ComponentStyle {
-                  "componentId": "sc-ifAKCX",
-                  "isStatic": true,
-                  "lastClassName": "fOGIFb",
-                  "rules": Array [
-                    "
-  display: flex;
-  justify-content: space-between;
-",
-                  ],
-                },
-                "displayName": "styled.div",
-                "foldedComponentIds": Array [],
-                "render": [Function],
-                "styledComponentId": "sc-ifAKCX",
-                "target": "div",
-                "toString": [Function],
-                "warnTooManyClasses": [Function],
-                "withComponent": [Function],
-              },
-            },
-            "",
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": "Page content",
-                "className": "page-content",
-              },
-              "ref": null,
-              "rendered": "Page content",
-              "type": "div",
-            },
-          ],
-          "type": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "attrs": Array [],
-            "componentStyle": ComponentStyle {
-              "componentId": "sc-bxivhb",
-              "isStatic": true,
-              "lastClassName": "hWZXLf",
-              "rules": Array [
-                "
-  padding-top: ",
-                "20px",
-                ";
-  @media print {
-    padding-top: 0;
-  }
-",
-              ],
-            },
-            "displayName": "styled.div",
-            "foldedComponentIds": Array [],
-            "render": [Function],
-            "styledComponentId": "sc-bxivhb",
-            "target": "div",
-            "toString": [Function],
-            "warnTooManyClasses": [Function],
-            "withComponent": [Function],
-          },
-        },
-        false,
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-  Symbol(enzyme.__childContext__): null,
-}
+    Back
+  </BackLink>
+  <styled.div>
+    <styled.div>
+      <H1
+        size="LARGE"
+      >
+        Page title
+      </H1>
+    </styled.div>
+    <div
+      className="page-content"
+    >
+      Page content
+    </div>
+  </styled.div>
+</Fragment>
 `;
diff --git a/src/CurrentlyOut/__snapshots__/CurrentlyOut.test.js.snap b/src/CurrentlyOut/__snapshots__/CurrentlyOut.test.js.snap
index eefe4734c..80da9e579 100644
--- a/src/CurrentlyOut/__snapshots__/CurrentlyOut.test.js.snap
+++ b/src/CurrentlyOut/__snapshots__/CurrentlyOut.test.js.snap
@@ -1,4101 +1,311 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Currently out should display toCity when toAgencyDescription is not set  1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <CurrentlyOut
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "category": "C",
-          "commentText": "Comment text",
-          "dateOfBirth": "1960-12-31",
-          "firstName": "FirstName",
-          "ipeLevel": "standard",
-          "lastName": "LastName",
-          "location": "MDI-1-3-017",
-          "offenderNo": "G000GG",
-          "toCity": "York",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder=""
-    sortOrer="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder=""
-        />,
-        <table
-          className="row-gutters currently-out"
+  />
+  <table
+    className="row-gutters currently-out"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder=""
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-              <th
-                className="straight width10"
-              >
-                Current location
-              </th>
-              <th
-                className="straight width15"
-              >
-                Comment
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G000GG"
-                >
-                  <OffenderImage
-                    offenderNo="G000GG"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G000GG"
-                >
-                  <OffenderName
-                    firstName="FirstName"
-                    lastName="LastName"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate="1960-12-31"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location="MDI-1-3-017"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              />
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category="C"
-                  offenderNo="G000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                York
-              </td>
-              <td
-                className="row-gutters"
-              >
-                Comment text
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderName
-                      firstName="FirstName"
-                      lastName="LastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1960-12-31"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                />
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category="C"
-                    offenderNo="G000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  York
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  Comment text
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters currently-out",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Current location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Current location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Comment",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Comment",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderName
-                        firstName="FirstName"
-                        lastName="LastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1960-12-31"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category="C"
-                      offenderNo="G000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    York
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    Comment text
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G000GG",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1960-12-31"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      York
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      Comment text
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderImage
-                          offenderNo="G000GG"
-                        />,
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />,
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "FirstName",
-                          "lastName": "LastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate="1960-12-31"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": "1960-12-31",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location="MDI-1-3-017"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": "MDI-1-3-017",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "C",
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "York",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "York",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Comment text",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "Comment text",
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder=""
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+        <th
+          className="straight width10"
+        >
+          Current location
+        </th>
+        <th
+          className="straight width15"
+        >
+          Comment
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G000GG"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G000GG"
+          >
+            <OffenderImage
+              offenderNo="G000GG"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G000GG"
+          >
+            <OffenderName
+              firstName="FirstName"
+              lastName="LastName"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate
+            isoDate="1960-12-31"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location)
+            location="MDI-1-3-017"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        />
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder=""
-          />,
-          <table
-            className="row-gutters currently-out"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderName
-                      firstName="FirstName"
-                      lastName="LastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1960-12-31"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                />
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category="C"
-                    offenderNo="G000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  York
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  Comment text
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderName
-                        firstName="FirstName"
-                        lastName="LastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1960-12-31"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category="C"
-                      offenderNo="G000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    York
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    Comment text
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters currently-out",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder=""
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Current location
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Comment
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder=""
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Current location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Current location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Comment",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Comment",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1960-12-31"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      York
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      Comment text
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G000GG",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G000GG"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate="1960-12-31"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location="MDI-1-3-017"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category="C"
-                          offenderNo="G000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        York
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        Comment text
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G000GG"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderImage
-                            offenderNo="G000GG"
-                          />,
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "offenderNo": "G000GG",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />,
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "firstName": "FirstName",
-                            "lastName": "LastName",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate="1960-12-31"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": "1960-12-31",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location="MDI-1-3-017"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": "MDI-1-3-017",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category="C"
-                          offenderNo="G000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "C",
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "York",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "York",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Comment text",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "Comment text",
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category="C"
+            offenderNo="G000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          York
+        </td>
+        <td
+          className="row-gutters"
+        >
+          Comment text
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
 
 exports[`Currently out should render the page 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <CurrentlyOut
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "category": "C",
-          "commentText": "Comment text",
-          "dateOfBirth": "1960-12-31",
-          "firstName": "FirstName",
-          "ipeLevel": "standard",
-          "lastName": "LastName",
-          "location": "MDI-1-3-017",
-          "offenderNo": "G000GG",
-          "toAgencyDescription": "To Agency Description",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder=""
-    sortOrer="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder=""
-        />,
-        <table
-          className="row-gutters currently-out"
+  />
+  <table
+    className="row-gutters currently-out"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder=""
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-              <th
-                className="straight width10"
-              >
-                Current location
-              </th>
-              <th
-                className="straight width15"
-              >
-                Comment
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G000GG"
-                >
-                  <OffenderImage
-                    offenderNo="G000GG"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G000GG"
-                >
-                  <OffenderName
-                    firstName="FirstName"
-                    lastName="LastName"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate="1960-12-31"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location="MDI-1-3-017"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              />
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category="C"
-                  offenderNo="G000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                To Agency Description
-              </td>
-              <td
-                className="row-gutters"
-              >
-                Comment text
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderName
-                      firstName="FirstName"
-                      lastName="LastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1960-12-31"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                />
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category="C"
-                    offenderNo="G000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  To Agency Description
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  Comment text
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters currently-out",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Current location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Current location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Comment",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Comment",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderName
-                        firstName="FirstName"
-                        lastName="LastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1960-12-31"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category="C"
-                      offenderNo="G000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    To Agency Description
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    Comment text
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G000GG",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1960-12-31"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      To Agency Description
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      Comment text
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderImage
-                          offenderNo="G000GG"
-                        />,
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />,
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "FirstName",
-                          "lastName": "LastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate="1960-12-31"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": "1960-12-31",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location="MDI-1-3-017"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": "MDI-1-3-017",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "C",
-                        "offenderNo": "G000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "To Agency Description",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "To Agency Description",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Comment text",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "Comment text",
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder=""
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+        <th
+          className="straight width10"
+        >
+          Current location
+        </th>
+        <th
+          className="straight width15"
+        >
+          Comment
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G000GG"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G000GG"
+          >
+            <OffenderImage
+              offenderNo="G000GG"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G000GG"
+          >
+            <OffenderName
+              firstName="FirstName"
+              lastName="LastName"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate
+            isoDate="1960-12-31"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location)
+            location="MDI-1-3-017"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        />
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder=""
-          />,
-          <table
-            className="row-gutters currently-out"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder=""
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Current location
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Comment
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G000GG"
-                  >
-                    <OffenderName
-                      firstName="FirstName"
-                      lastName="LastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1960-12-31"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                />
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category="C"
-                    offenderNo="G000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  To Agency Description
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  Comment text
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G000GG"
-                    >
-                      <OffenderName
-                        firstName="FirstName"
-                        lastName="LastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1960-12-31"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category="C"
-                      offenderNo="G000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    To Agency Description
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    Comment text
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters currently-out",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder=""
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Current location
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Comment
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder=""
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Current location
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Comment
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder=""
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Current location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Current location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Comment",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Comment",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G000GG"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G000GG"
-                      >
-                        <OffenderName
-                          firstName="FirstName"
-                          lastName="LastName"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1960-12-31"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category="C"
-                        offenderNo="G000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      To Agency Description
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      Comment text
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G000GG",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G000GG"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate="1960-12-31"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location="MDI-1-3-017"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category="C"
-                          offenderNo="G000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        To Agency Description
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        Comment text
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G000GG"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderImage
-                            offenderNo="G000GG"
-                          />,
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "offenderNo": "G000GG",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G000GG"
-                        >
-                          <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderName
-                            firstName="FirstName"
-                            lastName="LastName"
-                          />,
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "firstName": "FirstName",
-                            "lastName": "LastName",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate="1960-12-31"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": "1960-12-31",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location="MDI-1-3-017"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": "MDI-1-3-017",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category="C"
-                          offenderNo="G000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "C",
-                          "offenderNo": "G000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "To Agency Description",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "To Agency Description",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Comment text",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "Comment text",
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category="C"
+            offenderNo="G000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          To Agency Description
+        </td>
+        <td
+          className="row-gutters"
+        >
+          Comment text
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
diff --git a/src/EnRoute/__snapshots__/EnRoute.test.js.snap b/src/EnRoute/__snapshots__/EnRoute.test.js.snap
index bc95c4003..08b5b712d 100644
--- a/src/EnRoute/__snapshots__/EnRoute.test.js.snap
+++ b/src/EnRoute/__snapshots__/EnRoute.test.js.snap
@@ -1,1828 +1,134 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`En route should render page correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <EnRoute
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "fromAgencyDescription": "Hull (HMP)",
-          "lastName": "lastName",
-          "movementDate": "2019-10-10",
-          "movementReasonDescription": "Normal transfer",
-          "movementTime": "12:01:02",
-          "offenderNo": "G0000GG",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width15"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width15"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                Departed
-              </th>
-              <th
-                className="straight width15"
-              >
-                En route from
-              </th>
-              <th
-                className="straight width15"
-              >
-                Reason
-              </th>
-              <th
-                className="straight width25"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderImage
-                  offenderNo="G0000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderName
-                  firstName="firstName"
-                  lastName="lastName"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G0000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td>
-                <div>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </div>
-                <FormattedDate
-                  isoDate="2019-10-10"
-                />
-              </td>
-              <td>
-                Hull (HMP)
-              </td>
-              <td>
-                Normal transfer
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo={undefined}
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Departed
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  En route from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td>
-                  <div>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </div>
-                  <FormattedDate
-                    isoDate="2019-10-10"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td>
-                  Normal transfer
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo={undefined}
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Departed
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  En route from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Departed
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    En route from
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Reason
-                  </th>,
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Departed",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Departed",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "En route from",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "En route from",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Reason",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Reason",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width25",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td>
-                    <div>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </div>
-                    <FormattedDate
-                      isoDate="2019-10-10"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td>
-                    Normal transfer
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo={undefined}
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G0000GG_Hull (HMP)___",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td>
-                      <div>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </div>
-                      <FormattedDate
-                        isoDate="2019-10-10"
-                      />
-                    </td>,
-                    <td>
-                      Hull (HMP)
-                    </td>,
-                    <td>
-                      Normal transfer
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderImage
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "firstName": "firstName",
-                        "lastName": "lastName",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G0000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G0000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": Array [
-                        <div>
-                          <HoursAndMinutes
-                            hhmmss="12:01:02"
-                          />
-                        </div>,
-                        <FormattedDate
-                          isoDate="2019-10-10"
-                        />,
-                      ],
-                    },
-                    "ref": null,
-                    "rendered": Array [
-                      Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "host",
-                        "props": Object {
-                          "children": <HoursAndMinutes
-                            hhmmss="12:01:02"
-                          />,
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "hhmmss": "12:01:02",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": "div",
-                      },
-                      Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": "2019-10-10",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                    ],
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Hull (HMP)",
-                    },
-                    "ref": null,
-                    "rendered": "Hull (HMP)",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Normal transfer",
-                    },
-                    "ref": null,
-                    "rendered": "Normal transfer",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          Departed
+        </th>
+        <th
+          className="straight width15"
+        >
+          En route from
+        </th>
+        <th
+          className="straight width15"
+        >
+          Reason
+        </th>
+        <th
+          className="straight width25"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G0000GG_Hull (HMP)___"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderImage
+            offenderNo="G0000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderName
+            firstName="firstName"
+            lastName="lastName"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G0000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td>
+          <div>
+            <HoursAndMinutes
+              hhmmss="12:01:02"
+            />
+          </div>
+          <FormattedDate
+            isoDate="2019-10-10"
+          />
+        </td>
+        <td>
+          Hull (HMP)
+        </td>
+        <td>
+          Normal transfer
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Departed
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  En route from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td>
-                  <div>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </div>
-                  <FormattedDate
-                    isoDate="2019-10-10"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td>
-                  Normal transfer
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo={undefined}
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Departed
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    En route from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Reason
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td>
-                    <div>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </div>
-                    <FormattedDate
-                      isoDate="2019-10-10"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td>
-                    Normal transfer
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo={undefined}
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Departed
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    En route from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Reason
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width15"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Departed
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      En route from
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Reason
-                    </th>,
-                    <th
-                      className="straight width25"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Departed",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Departed",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "En route from",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "En route from",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Reason",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Reason",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width25",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td>
-                      <div>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </div>
-                      <FormattedDate
-                        isoDate="2019-10-10"
-                      />
-                    </td>
-                    <td>
-                      Hull (HMP)
-                    </td>
-                    <td>
-                      Normal transfer
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G0000GG_Hull (HMP)___",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G0000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td>
-                        <div>
-                          <HoursAndMinutes
-                            hhmmss="12:01:02"
-                          />
-                        </div>
-                        <FormattedDate
-                          isoDate="2019-10-10"
-                        />
-                      </td>,
-                      <td>
-                        Hull (HMP)
-                      </td>,
-                      <td>
-                        Normal transfer
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo={undefined}
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderImage
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G0000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G0000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": Array [
-                          <div>
-                            <HoursAndMinutes
-                              hhmmss="12:01:02"
-                            />
-                          </div>,
-                          <FormattedDate
-                            isoDate="2019-10-10"
-                          />,
-                        ],
-                      },
-                      "ref": null,
-                      "rendered": Array [
-                        Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "host",
-                          "props": Object {
-                            "children": <HoursAndMinutes
-                              hhmmss="12:01:02"
-                            />,
-                          },
-                          "ref": null,
-                          "rendered": Object {
-                            "instance": null,
-                            "key": undefined,
-                            "nodeType": "function",
-                            "props": Object {
-                              "hhmmss": "12:01:02",
-                            },
-                            "ref": null,
-                            "rendered": null,
-                            "type": [Function],
-                          },
-                          "type": "div",
-                        },
-                        Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "isoDate": "2019-10-10",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                      ],
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Hull (HMP)",
-                      },
-                      "ref": null,
-                      "rendered": "Hull (HMP)",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Normal transfer",
-                      },
-                      "ref": null,
-                      "rendered": "Normal transfer",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
diff --git a/src/InReception/__snapshots__/InReception.test.js.snap b/src/InReception/__snapshots__/InReception.test.js.snap
index a29622b65..c8bcc1c4c 100644
--- a/src/InReception/__snapshots__/InReception.test.js.snap
+++ b/src/InReception/__snapshots__/InReception.test.js.snap
@@ -1,3579 +1,267 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`In Reception should display fromCity when fromAgencyDescription is not set  1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <InReception
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "dateOfBirth": "1980-10-10",
-          "firstName": "firstName",
-          "fromCity": "York",
-          "iepLevel": "Entry",
-          "lastName": "lastName",
-          "offenderNo": "offenderNo",
-          "timeOut": "12:00",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table>
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width15"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width15"
-              >
-                 Received from 
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP 
-              </th>
-              <th
-                className="straight width25"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="offenderNo"
-                >
-                  <OffenderImage
-                    offenderNo="offenderNo"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="offenderNo"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                offenderNo
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate="1980-10-10"
-                />
-              </td>
-              <td>
-                 
-                York
-                 
-              </td>
-              <td>
-                 
-                Entry
-                 
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="offenderNo"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1980-10-10"
-                  />
-                </td>
-                <td>
-                   
-                  York
-                   
-                </td>
-                <td>
-                   
-                  Entry
-                   
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="offenderNo"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>,
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": " Received from ",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": " Received from ",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP ",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP ",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width25",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1980-10-10"
-                    />
-                  </td>
-                  <td>
-                     
-                    York
-                     
-                  </td>
-                  <td>
-                     
-                    Entry
-                     
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "offenderNo",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1980-10-10"
-                      />
-                    </td>,
-                    <td>
-                       
-                      York
-                       
-                    </td>,
-                    <td>
-                       
-                      Entry
-                       
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderImage
-                          offenderNo="offenderNo"
-                        />,
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "offenderNo",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "offenderNo",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate="1980-10-10"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": "1980-10-10",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": Array [
-                        " ",
-                        "York",
-                        " ",
-                      ],
-                    },
-                    "ref": null,
-                    "rendered": Array [
-                      " ",
-                      "York",
-                      " ",
-                    ],
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": Array [
-                        " ",
-                        "Entry",
-                        " ",
-                      ],
-                    },
-                    "ref": null,
-                    "rendered": Array [
-                      " ",
-                      "Entry",
-                      " ",
-                    ],
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+  />
+  <table>
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width15"
+        >
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width15"
+        >
+           Received from 
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP 
+        </th>
+        <th
+          className="straight width25"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="offenderNo"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="offenderNo"
+          >
+            <OffenderImage
+              offenderNo="offenderNo"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="offenderNo"
+          >
+            <OffenderName
+              firstName="firstName"
+              lastName="lastName"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          offenderNo
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate
+            isoDate="1980-10-10"
+          />
+        </td>
+        <td>
+           
+          York
+           
+        </td>
+        <td>
+           
+          Entry
+           
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table>
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1980-10-10"
-                  />
-                </td>
-                <td>
-                   
-                  York
-                   
-                </td>
-                <td>
-                   
-                  Entry
-                   
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="offenderNo"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1980-10-10"
-                    />
-                  </td>
-                  <td>
-                     
-                    York
-                     
-                  </td>
-                  <td>
-                     
-                    Entry
-                     
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width15"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                       Received from 
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP 
-                    </th>,
-                    <th
-                      className="straight width25"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": " Received from ",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": " Received from ",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP ",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP ",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width25",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1980-10-10"
-                      />
-                    </td>
-                    <td>
-                       
-                      York
-                       
-                    </td>
-                    <td>
-                       
-                      Entry
-                       
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "offenderNo",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderImage
-                            offenderNo="offenderNo"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        offenderNo
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate="1980-10-10"
-                        />
-                      </td>,
-                      <td>
-                         
-                        York
-                         
-                      </td>,
-                      <td>
-                         
-                        Entry
-                         
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="offenderNo"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderImage
-                            offenderNo="offenderNo"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderImage
-                            offenderNo="offenderNo"
-                          />,
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "offenderNo": "offenderNo",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />,
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "firstName": "firstName",
-                            "lastName": "lastName",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "offenderNo",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "offenderNo",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate="1980-10-10"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": "1980-10-10",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": Array [
-                          " ",
-                          "York",
-                          " ",
-                        ],
-                      },
-                      "ref": null,
-                      "rendered": Array [
-                        " ",
-                        "York",
-                        " ",
-                      ],
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": Array [
-                          " ",
-                          "Entry",
-                          " ",
-                        ],
-                      },
-                      "ref": null,
-                      "rendered": Array [
-                        " ",
-                        "Entry",
-                        " ",
-                      ],
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="offenderNo"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="offenderNo"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
 
 exports[`In Reception should render the page correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <InReception
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "dateOfBirth": "1980-10-10",
-          "firstName": "firstName",
-          "fromAgencyDescription": "Leeds",
-          "iepLevel": "Entry",
-          "lastName": "lastName",
-          "offenderNo": "offenderNo",
-          "timeOut": "12:00",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table>
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width15"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width15"
-              >
-                 Received from 
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP 
-              </th>
-              <th
-                className="straight width25"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="offenderNo"
-                >
-                  <OffenderImage
-                    offenderNo="offenderNo"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="offenderNo"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                offenderNo
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate="1980-10-10"
-                />
-              </td>
-              <td>
-                 
-                Leeds
-                 
-              </td>
-              <td>
-                 
-                Entry
-                 
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="offenderNo"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1980-10-10"
-                  />
-                </td>
-                <td>
-                   
-                  Leeds
-                   
-                </td>
-                <td>
-                   
-                  Entry
-                   
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="offenderNo"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>,
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": " Received from ",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": " Received from ",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP ",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP ",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width25",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1980-10-10"
-                    />
-                  </td>
-                  <td>
-                     
-                    Leeds
-                     
-                  </td>
-                  <td>
-                     
-                    Entry
-                     
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "offenderNo",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1980-10-10"
-                      />
-                    </td>,
-                    <td>
-                       
-                      Leeds
-                       
-                    </td>,
-                    <td>
-                       
-                      Entry
-                       
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderImage
-                          offenderNo="offenderNo"
-                        />,
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "offenderNo",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "offenderNo",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate="1980-10-10"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": "1980-10-10",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": Array [
-                        " ",
-                        "Leeds",
-                        " ",
-                      ],
-                    },
-                    "ref": null,
-                    "rendered": Array [
-                      " ",
-                      "Leeds",
-                      " ",
-                    ],
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": Array [
-                        " ",
-                        "Entry",
-                        " ",
-                      ],
-                    },
-                    "ref": null,
-                    "rendered": Array [
-                      " ",
-                      "Entry",
-                      " ",
-                    ],
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+  />
+  <table>
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width15"
+        >
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width15"
+        >
+           Received from 
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP 
+        </th>
+        <th
+          className="straight width25"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="offenderNo"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="offenderNo"
+          >
+            <OffenderImage
+              offenderNo="offenderNo"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="offenderNo"
+          >
+            <OffenderName
+              firstName="firstName"
+              lastName="lastName"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          offenderNo
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate
+            isoDate="1980-10-10"
+          />
+        </td>
+        <td>
+           
+          Leeds
+           
+        </td>
+        <td>
+           
+          Entry
+           
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table>
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width15"
-                >
-                   Received from 
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP 
-                </th>
-                <th
-                  className="straight width25"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="offenderNo"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate="1980-10-10"
-                  />
-                </td>
-                <td>
-                   
-                  Leeds
-                   
-                </td>
-                <td>
-                   
-                  Entry
-                   
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="offenderNo"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="offenderNo"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate="1980-10-10"
-                    />
-                  </td>
-                  <td>
-                     
-                    Leeds
-                     
-                  </td>
-                  <td>
-                     
-                    Entry
-                     
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                     Received from 
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP 
-                  </th>
-                  <th
-                    className="straight width25"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width15"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                       Received from 
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP 
-                    </th>,
-                    <th
-                      className="straight width25"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": " Received from ",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": " Received from ",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP ",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP ",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width25",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="offenderNo"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate="1980-10-10"
-                      />
-                    </td>
-                    <td>
-                       
-                      Leeds
-                       
-                    </td>
-                    <td>
-                       
-                      Entry
-                       
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="offenderNo"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "offenderNo",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderImage
-                            offenderNo="offenderNo"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        offenderNo
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate="1980-10-10"
-                        />
-                      </td>,
-                      <td>
-                         
-                        Leeds
-                         
-                      </td>,
-                      <td>
-                         
-                        Entry
-                         
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="offenderNo"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderImage
-                            offenderNo="offenderNo"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderImage
-                            offenderNo="offenderNo"
-                          />,
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "offenderNo": "offenderNo",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="offenderNo"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />,
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "firstName": "firstName",
-                            "lastName": "lastName",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "offenderNo",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "offenderNo",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate="1980-10-10"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": "1980-10-10",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": Array [
-                          " ",
-                          "Leeds",
-                          " ",
-                        ],
-                      },
-                      "ref": null,
-                      "rendered": Array [
-                        " ",
-                        "Leeds",
-                        " ",
-                      ],
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": Array [
-                          " ",
-                          "Entry",
-                          " ",
-                        ],
-                      },
-                      "ref": null,
-                      "rendered": Array [
-                        " ",
-                        "Entry",
-                        " ",
-                      ],
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="offenderNo"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="offenderNo"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
diff --git a/src/MovementsIn/__snapshots__/MovementsIn.test.js.snap b/src/MovementsIn/__snapshots__/MovementsIn.test.js.snap
index 711287455..e7120bf55 100644
--- a/src/MovementsIn/__snapshots__/MovementsIn.test.js.snap
+++ b/src/MovementsIn/__snapshots__/MovementsIn.test.js.snap
@@ -1,7662 +1,565 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Movements in should display fromCity when fromAgencyDescription is not set  1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <MovementsIn
-    agencyId="LEI"
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "fromCity": "York",
-          "lastName": "lastName",
-          "location": "CELL-1",
-          "movementTime": "12:01:02",
-          "offenderNo": "G0000GG",
-          "toAgencyCode": "HLI",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                Time in
-              </th>
-              <th
-                className="straight width15"
-              >
-                Arrived from
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderImage
-                  offenderNo="G0000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderName
-                  firstName="firstName"
-                  lastName="lastName"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G0000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td />
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location="CELL-1"
-                />
-              </td>
-              <td>
-                <HoursAndMinutes
-                  hhmmss="12:01:02"
-                />
-              </td>
-              <td>
-                York
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="G0000GG"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="CELL-1"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  York
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Time in",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Time in",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Arrived from",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Arrived from",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="CELL-1"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    York
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G0000GG___CELL-1_",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="CELL-1"
-                      />
-                    </td>,
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>,
-                    <td>
-                      York
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderImage
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "firstName": "firstName",
-                        "lastName": "lastName",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G0000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G0000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location="CELL-1"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": "CELL-1",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />,
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "hhmmss": "12:01:02",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "York",
-                    },
-                    "ref": null,
-                    "rendered": "York",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          Time in
+        </th>
+        <th
+          className="straight width15"
+        >
+          Arrived from
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G0000GG___CELL-1_"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderImage
+            offenderNo="G0000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderName
+            firstName="firstName"
+            lastName="lastName"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G0000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td />
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location)
+            location="CELL-1"
+          />
+        </td>
+        <td>
+          <HoursAndMinutes
+            hhmmss="12:01:02"
+          />
+        </td>
+        <td>
+          York
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="CELL-1"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  York
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="CELL-1"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    York
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Time in
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Arrived from
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Time in",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Time in",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Arrived from",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Arrived from",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="CELL-1"
-                      />
-                    </td>
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>
-                    <td>
-                      York
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G0000GG___CELL-1_",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G0000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location="CELL-1"
-                        />
-                      </td>,
-                      <td>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </td>,
-                      <td>
-                        York
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderImage
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G0000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G0000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location="CELL-1"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": "CELL-1",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />,
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "hhmmss": "12:01:02",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "York",
-                      },
-                      "ref": null,
-                      "rendered": "York",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="G0000GG"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
 
 exports[`Movements in should remove the offender link when the location is not set 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <MovementsIn
-    agencyId="HLI"
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "fromAgencyDescription": "Hull (HMP)",
-          "lastName": "lastName",
-          "movementTime": "12:01:02",
-          "offenderNo": "G0000GG",
-          "toAgencyCode": "HLI",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                Time in
-              </th>
-              <th
-                className="straight width15"
-              >
-                Arrived from
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderImage
-                  offenderNo="G0000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderName
-                  firstName="firstName"
-                  lastName="lastName"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G0000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td />
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location={undefined}
-                />
-              </td>
-              <td>
-                <HoursAndMinutes
-                  hhmmss="12:01:02"
-                />
-              </td>
-              <td>
-                Hull (HMP)
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="G0000GG"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location={undefined}
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Time in",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Time in",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Arrived from",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Arrived from",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location={undefined}
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G0000GG_Hull (HMP)___",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location={undefined}
-                      />
-                    </td>,
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>,
-                    <td>
-                      Hull (HMP)
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderImage
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "firstName": "firstName",
-                        "lastName": "lastName",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G0000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G0000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />,
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "hhmmss": "12:01:02",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Hull (HMP)",
-                    },
-                    "ref": null,
-                    "rendered": "Hull (HMP)",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          Time in
+        </th>
+        <th
+          className="straight width15"
+        >
+          Arrived from
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G0000GG_Hull (HMP)___"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderImage
+            offenderNo="G0000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderName
+            firstName="firstName"
+            lastName="lastName"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G0000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td />
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location) />
+        </td>
+        <td>
+          <HoursAndMinutes
+            hhmmss="12:01:02"
+          />
+        </td>
+        <td>
+          Hull (HMP)
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location={undefined}
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location={undefined}
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Time in
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Arrived from
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Time in",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Time in",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Arrived from",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Arrived from",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location={undefined}
-                      />
-                    </td>
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>
-                    <td>
-                      Hull (HMP)
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G0000GG_Hull (HMP)___",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G0000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location={undefined}
-                        />
-                      </td>,
-                      <td>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </td>,
-                      <td>
-                        Hull (HMP)
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderImage
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G0000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G0000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />,
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "hhmmss": "12:01:02",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Hull (HMP)",
-                      },
-                      "ref": null,
-                      "rendered": "Hull (HMP)",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="G0000GG"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
 
 exports[`Movements in should remove the offender link when the toAgencyId does not match the current agencyId/active case load 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <MovementsIn
-    agencyId="LEI"
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "fromAgencyDescription": "Hull (HMP)",
-          "lastName": "lastName",
-          "location": "CELL-1",
-          "movementTime": "12:01:02",
-          "offenderNo": "G0000GG",
-          "toAgencyCode": "HLI",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                Time in
-              </th>
-              <th
-                className="straight width15"
-              >
-                Arrived from
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderImage
-                  offenderNo="G0000GG"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderName
-                  firstName="firstName"
-                  lastName="lastName"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G0000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td />
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location="CELL-1"
-                />
-              </td>
-              <td>
-                <HoursAndMinutes
-                  hhmmss="12:01:02"
-                />
-              </td>
-              <td>
-                Hull (HMP)
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="G0000GG"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="CELL-1"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Time in",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Time in",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Arrived from",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Arrived from",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="CELL-1"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G0000GG_Hull (HMP)__CELL-1_",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="CELL-1"
-                      />
-                    </td>,
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>,
-                    <td>
-                      Hull (HMP)
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderImage
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "firstName": "firstName",
-                        "lastName": "lastName",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G0000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G0000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location="CELL-1"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": "CELL-1",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />,
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "hhmmss": "12:01:02",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Hull (HMP)",
-                    },
-                    "ref": null,
-                    "rendered": "Hull (HMP)",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          Time in
+        </th>
+        <th
+          className="straight width15"
+        >
+          Arrived from
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G0000GG_Hull (HMP)__CELL-1_"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderImage
+            offenderNo="G0000GG"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderName
+            firstName="firstName"
+            lastName="lastName"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G0000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td />
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location)
+            location="CELL-1"
+          />
+        </td>
+        <td>
+          <HoursAndMinutes
+            hhmmss="12:01:02"
+          />
+        </td>
+        <td>
+          Hull (HMP)
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="CELL-1"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="CELL-1"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Time in
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Arrived from
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Time in",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Time in",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Arrived from",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Arrived from",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="CELL-1"
-                      />
-                    </td>
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>
-                    <td>
-                      Hull (HMP)
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G0000GG_Hull (HMP)__CELL-1_",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G0000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location="CELL-1"
-                        />
-                      </td>,
-                      <td>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </td>,
-                      <td>
-                        Hull (HMP)
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderImage
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G0000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G0000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location="CELL-1"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": "CELL-1",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />,
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "hhmmss": "12:01:02",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Hull (HMP)",
-                      },
-                      "ref": null,
-                      "rendered": "Hull (HMP)",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="G0000GG"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
 
 exports[`Movements in should render page correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <MovementsIn
-    agencyId="MDI"
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "fromAgencyDescription": "Hull (HMP)",
-          "lastName": "lastName",
-          "location": "MDI-1-3-017",
-          "movementTime": "12:01:02",
-          "offenderNo": "G0000GG",
-          "toAgencyId": "MDI",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width10"
+        />
+        <th
+          className="straight width10"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width10"
-              />
-              <th
-                className="straight width10"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width10"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width10"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width10"
-              >
-                IEP
-              </th>
-              <th
-                className="straight width10"
-              >
-                Location
-              </th>
-              <th
-                className="straight width10"
-              >
-                Time in
-              </th>
-              <th
-                className="straight width15"
-              >
-                Arrived from
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G0000GG"
-                >
-                  <OffenderImage
-                    offenderNo="G0000GG"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderLink
-                  alerts={false}
-                  offenderNo="G0000GG"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </OffenderLink>
-              </td>
-              <td
-                className="row-gutters"
-              >
-                G0000GG
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td />
-              <td
-                className="row-gutters"
-              >
-                <Connect(Location)
-                  location="MDI-1-3-017"
-                />
-              </td>
-              <td>
-                <HoursAndMinutes
-                  hhmmss="12:01:02"
-                />
-              </td>
-              <td>
-                Hull (HMP)
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo="G0000GG"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G0000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G0000GG"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width10"
-                  />,
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "IEP",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "IEP",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Location",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Location",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Time in",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Time in",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Arrived from",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Arrived from",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G0000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G0000GG"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "G0000GG_Hull (HMP)__MDI-1-3-017_MDI",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td />,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>,
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>,
-                    <td>
-                      Hull (HMP)
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderImage
-                          offenderNo="G0000GG"
-                        />,
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": false,
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "G0000GG",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "G0000GG",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": undefined,
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Connect(Location)
-                        location="MDI-1-3-017"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "class",
-                      "props": Object {
-                        "location": "MDI-1-3-017",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />,
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "hhmmss": "12:01:02",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Hull (HMP)",
-                    },
-                    "ref": null,
-                    "rendered": "Hull (HMP)",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": "G0000GG",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width10"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width10"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width10"
+        >
+          IEP
+        </th>
+        <th
+          className="straight width10"
+        >
+          Location
+        </th>
+        <th
+          className="straight width10"
+        >
+          Time in
+        </th>
+        <th
+          className="straight width15"
+        >
+          Arrived from
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="G0000GG_Hull (HMP)__MDI-1-3-017_MDI"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G0000GG"
+          >
+            <OffenderImage
+              offenderNo="G0000GG"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderLink
+            alerts={false}
+            offenderNo="G0000GG"
+          >
+            <OffenderName
+              firstName="firstName"
+              lastName="lastName"
+            />
+          </OffenderLink>
+        </td>
+        <td
+          className="row-gutters"
+        >
+          G0000GG
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td />
+        <td
+          className="row-gutters"
+        >
+          <Connect(Location)
+            location="MDI-1-3-017"
+          />
+        </td>
+        <td>
+          <HoursAndMinutes
+            hhmmss="12:01:02"
+          />
+        </td>
+        <td>
+          Hull (HMP)
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width10"
-                />
-                <th
-                  className="straight width10"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  IEP
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Location
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Time in
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Arrived from
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G0000GG"
-                  >
-                    <OffenderImage
-                      offenderNo="G0000GG"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderLink
-                    alerts={false}
-                    offenderNo="G0000GG"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </OffenderLink>
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  G0000GG
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td />
-                <td
-                  className="row-gutters"
-                >
-                  <Connect(Location)
-                    location="MDI-1-3-017"
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:01:02"
-                  />
-                </td>
-                <td>
-                  Hull (HMP)
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo="G0000GG"
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G0000GG"
-                    >
-                      <OffenderImage
-                        offenderNo="G0000GG"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderLink
-                      alerts={false}
-                      offenderNo="G0000GG"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </OffenderLink>
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    G0000GG
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td />
-                  <td
-                    className="row-gutters"
-                  >
-                    <Connect(Location)
-                      location="MDI-1-3-017"
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:01:02"
-                    />
-                  </td>
-                  <td>
-                    Hull (HMP)
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo="G0000GG"
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width10"
-                  />
-                  <th
-                    className="straight width10"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    IEP
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Location
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Time in
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Arrived from
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width10"
-                    />,
-                    <th
-                      className="straight width10"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      IEP
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Location
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Time in
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Arrived from
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "IEP",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "IEP",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Location",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Location",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Time in",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Time in",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Arrived from",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Arrived from",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderImage
-                          offenderNo="G0000GG"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderLink
-                        alerts={false}
-                        offenderNo="G0000GG"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </OffenderLink>
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      G0000GG
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td />
-                    <td
-                      className="row-gutters"
-                    >
-                      <Connect(Location)
-                        location="MDI-1-3-017"
-                      />
-                    </td>
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:01:02"
-                      />
-                    </td>
-                    <td>
-                      Hull (HMP)
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo="G0000GG"
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "G0000GG_Hull (HMP)__MDI-1-3-017_MDI",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G0000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G0000GG"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderLink
-                          alerts={false}
-                          offenderNo="G0000GG"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        G0000GG
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td />,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Connect(Location)
-                          location="MDI-1-3-017"
-                        />
-                      </td>,
-                      <td>
-                        <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />
-                      </td>,
-                      <td>
-                        Hull (HMP)
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G0000GG"
-                        >
-                          <OffenderImage
-                            offenderNo="G0000GG"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderImage
-                            offenderNo="G0000GG"
-                          />,
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "offenderNo": "G0000GG",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderLink
-                          alerts={false}
-                          offenderNo="G0000GG"
-                        >
-                          <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />
-                        </OffenderLink>,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": false,
-                          "children": <OffenderName
-                            firstName="firstName"
-                            lastName="lastName"
-                          />,
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": Object {
-                          "instance": null,
-                          "key": undefined,
-                          "nodeType": "function",
-                          "props": Object {
-                            "firstName": "firstName",
-                            "lastName": "lastName",
-                          },
-                          "ref": null,
-                          "rendered": null,
-                          "type": [Function],
-                        },
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "G0000GG",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "G0000GG",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Connect(Location)
-                          location="MDI-1-3-017"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "class",
-                        "props": Object {
-                          "location": "MDI-1-3-017",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <HoursAndMinutes
-                          hhmmss="12:01:02"
-                        />,
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "hhmmss": "12:01:02",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "Hull (HMP)",
-                      },
-                      "ref": null,
-                      "rendered": "Hull (HMP)",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo="G0000GG"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": "G0000GG",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+            offenderNo="G0000GG"
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
diff --git a/src/MovementsOut/__snapshots__/MovementsOut.test.js.snap b/src/MovementsOut/__snapshots__/MovementsOut.test.js.snap
index 889626527..2ce6102c2 100644
--- a/src/MovementsOut/__snapshots__/MovementsOut.test.js.snap
+++ b/src/MovementsOut/__snapshots__/MovementsOut.test.js.snap
@@ -1,1612 +1,121 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Movements out should render page correctly 1`] = `
-ShallowWrapper {
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <MovementsOut
-    rows={
+<Fragment>
+  <SortLov
+    setColumnSort={[MockFunction]}
+    sortColumn="lastName"
+    sortColumns={
       Array [
-        Object {
-          "alerts": Array [
-            "HA",
-            "XSA",
-            "XA",
-            "PEEP",
-            "XEL",
-            "XRF",
-            "XTACT",
-          ],
-          "firstName": "firstName",
-          "lastName": "lastName",
-          "offenderNo": "offenderNo",
-          "reasonDescription": "reasonDescription",
-          "timeOut": "12:00",
-        },
+        "lastName",
       ]
     }
-    setColumnSort={[MockFunction]}
     sortOrder="ASC"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "checkPropTypes": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateError": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "function",
-    "props": Object {
-      "children": Array [
-        <SortLov
-          setColumnSort={[MockFunction]}
-          sortColumn="lastName"
-          sortColumns={
-            Array [
-              "lastName",
-            ]
-          }
-          sortOrder="ASC"
-        />,
-        <table
-          className="row-gutters"
+  />
+  <table
+    className="row-gutters"
+  >
+    <thead>
+      <tr>
+        <th
+          className="straight width5"
+        />
+        <th
+          className="straight width15"
         >
-          <thead>
-            <tr>
-              <th
-                className="straight width5"
-              />
-              <th
-                className="straight width15"
-              >
-                <SortableColumn
-                  column="lastName"
-                  heading="Name"
-                  setColumnSort={[MockFunction]}
-                  sortColumn="lastName"
-                  sortOrder="ASC"
-                />
-              </th>
-              <th
-                className="straight width5"
-              >
-                Prison no.
-              </th>
-              <th
-                className="straight width5"
-              >
-                D.O.B.
-              </th>
-              <th
-                className="straight width5"
-              >
-                Time out
-              </th>
-              <th
-                className="straight width10"
-              >
-                Reason
-              </th>
-              <th
-                className="straight width15"
-              >
-                Flags
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              className="row-gutters"
-            >
-              <td
-                className="row-gutters"
-              >
-                <OffenderImage
-                  offenderNo="offenderNo"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <OffenderName
-                  firstName="firstName"
-                  lastName="lastName"
-                />
-              </td>
-              <td
-                className="row-gutters"
-              >
-                offenderNo
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <FormattedDate
-                  isoDate={undefined}
-                />
-              </td>
-              <td>
-                <HoursAndMinutes
-                  hhmmss="12:00"
-                />
-              </td>
-              <td>
-                reasonDescription
-              </td>
-              <td
-                className="row-gutters"
-              >
-                <Flags
-                  alerts={
-                    Array [
-                      "HA",
-                      "XSA",
-                      "XA",
-                      "PEEP",
-                      "XEL",
-                      "XRF",
-                      "XTACT",
-                    ]
-                  }
-                  category=""
-                  offenderNo={undefined}
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>,
-      ],
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "function",
-        "props": Object {
-          "setColumnSort": [MockFunction],
-          "sortColumn": "lastName",
-          "sortColumns": Array [
-            "lastName",
-          ],
-          "sortOrder": "ASC",
-        },
-        "ref": null,
-        "rendered": null,
-        "type": [Function],
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <thead>
-              <tr>
-                <th
-                  className="straight width5"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Time out
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>,
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="offenderNo"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:00"
-                  />
-                </td>
-                <td>
-                  reasonDescription
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo={undefined}
-                  />
-                </td>
-              </tr>
-            </tbody>,
-          ],
-          "className": "row-gutters",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": <tr>
-                <th
-                  className="straight width5"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Time out
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>,
-            },
-            "ref": null,
-            "rendered": Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <th
-                    className="straight width5"
-                  />,
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>,
-                  <th
-                    className="straight width5"
-                  >
-                    Prison no.
-                  </th>,
-                  <th
-                    className="straight width5"
-                  >
-                    D.O.B.
-                  </th>,
-                  <th
-                    className="straight width5"
-                  >
-                    Time out
-                  </th>,
-                  <th
-                    className="straight width10"
-                  >
-                    Reason
-                  </th>,
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "className": "straight width5",
-                  },
-                  "ref": null,
-                  "rendered": null,
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />,
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "function",
-                    "props": Object {
-                      "column": "lastName",
-                      "heading": "Name",
-                      "setColumnSort": [MockFunction],
-                      "sortColumn": "lastName",
-                      "sortOrder": "ASC",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": [Function],
-                  },
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Prison no.",
-                    "className": "straight width5",
-                  },
-                  "ref": null,
-                  "rendered": "Prison no.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "D.O.B.",
-                    "className": "straight width5",
-                  },
-                  "ref": null,
-                  "rendered": "D.O.B.",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Time out",
-                    "className": "straight width5",
-                  },
-                  "ref": null,
-                  "rendered": "Time out",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Reason",
-                    "className": "straight width10",
-                  },
-                  "ref": null,
-                  "rendered": "Reason",
-                  "type": "th",
-                },
-                Object {
-                  "instance": null,
-                  "key": undefined,
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": "Flags",
-                    "className": "straight width15",
-                  },
-                  "ref": null,
-                  "rendered": "Flags",
-                  "type": "th",
-                },
-              ],
-              "type": "tr",
-            },
-            "type": "thead",
-          },
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "children": Array [
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:00"
-                    />
-                  </td>
-                  <td>
-                    reasonDescription
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo={undefined}
-                    />
-                  </td>
-                </tr>,
-              ],
-            },
-            "ref": null,
-            "rendered": Array [
-              Object {
-                "instance": null,
-                "key": "offenderNo_reasonDescription_12:00",
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>,
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:00"
-                      />
-                    </td>,
-                    <td>
-                      reasonDescription
-                    </td>,
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />
-                    </td>,
-                  ],
-                  "className": "row-gutters",
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderImage
-                        offenderNo="offenderNo"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "offenderNo": "offenderNo",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "firstName": "firstName",
-                        "lastName": "lastName",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "offenderNo",
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": "offenderNo",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <FormattedDate
-                        isoDate={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "isoDate": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <HoursAndMinutes
-                        hhmmss="12:00"
-                      />,
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "hhmmss": "12:00",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "reasonDescription",
-                    },
-                    "ref": null,
-                    "rendered": "reasonDescription",
-                    "type": "td",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />,
-                      "className": "row-gutters",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "alerts": Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ],
-                        "category": "",
-                        "offenderNo": undefined,
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "td",
-                  },
-                ],
-                "type": "tr",
-              },
-            ],
-            "type": "tbody",
-          },
-        ],
-        "type": "table",
-      },
-    ],
-    "type": Symbol(react.fragment),
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "function",
-      "props": Object {
-        "children": Array [
-          <SortLov
+          <SortableColumn
+            column="lastName"
+            heading="Name"
             setColumnSort={[MockFunction]}
             sortColumn="lastName"
-            sortColumns={
+            sortOrder="ASC"
+          />
+        </th>
+        <th
+          className="straight width5"
+        >
+          Prison no.
+        </th>
+        <th
+          className="straight width5"
+        >
+          D.O.B.
+        </th>
+        <th
+          className="straight width5"
+        >
+          Time out
+        </th>
+        <th
+          className="straight width10"
+        >
+          Reason
+        </th>
+        <th
+          className="straight width15"
+        >
+          Flags
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        className="row-gutters"
+        key="offenderNo_reasonDescription_12:00"
+      >
+        <td
+          className="row-gutters"
+        >
+          <OffenderImage
+            offenderNo="offenderNo"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <OffenderName
+            firstName="firstName"
+            lastName="lastName"
+          />
+        </td>
+        <td
+          className="row-gutters"
+        >
+          offenderNo
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <FormattedDate />
+        </td>
+        <td>
+          <HoursAndMinutes
+            hhmmss="12:00"
+          />
+        </td>
+        <td>
+          reasonDescription
+        </td>
+        <td
+          className="row-gutters"
+        >
+          <Flags
+            alerts={
               Array [
-                "lastName",
+                "HA",
+                "XSA",
+                "XA",
+                "PEEP",
+                "XEL",
+                "XRF",
+                "XTACT",
               ]
             }
-            sortOrder="ASC"
-          />,
-          <table
-            className="row-gutters"
-          >
-            <thead>
-              <tr>
-                <th
-                  className="straight width5"
-                />
-                <th
-                  className="straight width15"
-                >
-                  <SortableColumn
-                    column="lastName"
-                    heading="Name"
-                    setColumnSort={[MockFunction]}
-                    sortColumn="lastName"
-                    sortOrder="ASC"
-                  />
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Prison no.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  D.O.B.
-                </th>
-                <th
-                  className="straight width5"
-                >
-                  Time out
-                </th>
-                <th
-                  className="straight width10"
-                >
-                  Reason
-                </th>
-                <th
-                  className="straight width15"
-                >
-                  Flags
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                className="row-gutters"
-              >
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderImage
-                    offenderNo="offenderNo"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <OffenderName
-                    firstName="firstName"
-                    lastName="lastName"
-                  />
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  offenderNo
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <FormattedDate
-                    isoDate={undefined}
-                  />
-                </td>
-                <td>
-                  <HoursAndMinutes
-                    hhmmss="12:00"
-                  />
-                </td>
-                <td>
-                  reasonDescription
-                </td>
-                <td
-                  className="row-gutters"
-                >
-                  <Flags
-                    alerts={
-                      Array [
-                        "HA",
-                        "XSA",
-                        "XA",
-                        "PEEP",
-                        "XEL",
-                        "XRF",
-                        "XTACT",
-                      ]
-                    }
-                    category=""
-                    offenderNo={undefined}
-                  />
-                </td>
-              </tr>
-            </tbody>
-          </table>,
-        ],
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "function",
-          "props": Object {
-            "setColumnSort": [MockFunction],
-            "sortColumn": "lastName",
-            "sortColumns": Array [
-              "lastName",
-            ],
-            "sortOrder": "ASC",
-          },
-          "ref": null,
-          "rendered": null,
-          "type": [Function],
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <thead>
-                <tr>
-                  <th
-                    className="straight width5"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    Time out
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Reason
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>
-              </thead>,
-              <tbody>
-                <tr
-                  className="row-gutters"
-                >
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderImage
-                      offenderNo="offenderNo"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <OffenderName
-                      firstName="firstName"
-                      lastName="lastName"
-                    />
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    offenderNo
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <FormattedDate
-                      isoDate={undefined}
-                    />
-                  </td>
-                  <td>
-                    <HoursAndMinutes
-                      hhmmss="12:00"
-                    />
-                  </td>
-                  <td>
-                    reasonDescription
-                  </td>
-                  <td
-                    className="row-gutters"
-                  >
-                    <Flags
-                      alerts={
-                        Array [
-                          "HA",
-                          "XSA",
-                          "XA",
-                          "PEEP",
-                          "XEL",
-                          "XRF",
-                          "XTACT",
-                        ]
-                      }
-                      category=""
-                      offenderNo={undefined}
-                    />
-                  </td>
-                </tr>
-              </tbody>,
-            ],
-            "className": "row-gutters",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": <tr>
-                  <th
-                    className="straight width5"
-                  />
-                  <th
-                    className="straight width15"
-                  >
-                    <SortableColumn
-                      column="lastName"
-                      heading="Name"
-                      setColumnSort={[MockFunction]}
-                      sortColumn="lastName"
-                      sortOrder="ASC"
-                    />
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    Prison no.
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    D.O.B.
-                  </th>
-                  <th
-                    className="straight width5"
-                  >
-                    Time out
-                  </th>
-                  <th
-                    className="straight width10"
-                  >
-                    Reason
-                  </th>
-                  <th
-                    className="straight width15"
-                  >
-                    Flags
-                  </th>
-                </tr>,
-              },
-              "ref": null,
-              "rendered": Object {
-                "instance": null,
-                "key": undefined,
-                "nodeType": "host",
-                "props": Object {
-                  "children": Array [
-                    <th
-                      className="straight width5"
-                    />,
-                    <th
-                      className="straight width15"
-                    >
-                      <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />
-                    </th>,
-                    <th
-                      className="straight width5"
-                    >
-                      Prison no.
-                    </th>,
-                    <th
-                      className="straight width5"
-                    >
-                      D.O.B.
-                    </th>,
-                    <th
-                      className="straight width5"
-                    >
-                      Time out
-                    </th>,
-                    <th
-                      className="straight width10"
-                    >
-                      Reason
-                    </th>,
-                    <th
-                      className="straight width15"
-                    >
-                      Flags
-                    </th>,
-                  ],
-                },
-                "ref": null,
-                "rendered": Array [
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "className": "straight width5",
-                    },
-                    "ref": null,
-                    "rendered": null,
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": <SortableColumn
-                        column="lastName"
-                        heading="Name"
-                        setColumnSort={[MockFunction]}
-                        sortColumn="lastName"
-                        sortOrder="ASC"
-                      />,
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "function",
-                      "props": Object {
-                        "column": "lastName",
-                        "heading": "Name",
-                        "setColumnSort": [MockFunction],
-                        "sortColumn": "lastName",
-                        "sortOrder": "ASC",
-                      },
-                      "ref": null,
-                      "rendered": null,
-                      "type": [Function],
-                    },
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Prison no.",
-                      "className": "straight width5",
-                    },
-                    "ref": null,
-                    "rendered": "Prison no.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "D.O.B.",
-                      "className": "straight width5",
-                    },
-                    "ref": null,
-                    "rendered": "D.O.B.",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Time out",
-                      "className": "straight width5",
-                    },
-                    "ref": null,
-                    "rendered": "Time out",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Reason",
-                      "className": "straight width10",
-                    },
-                    "ref": null,
-                    "rendered": "Reason",
-                    "type": "th",
-                  },
-                  Object {
-                    "instance": null,
-                    "key": undefined,
-                    "nodeType": "host",
-                    "props": Object {
-                      "children": "Flags",
-                      "className": "straight width15",
-                    },
-                    "ref": null,
-                    "rendered": "Flags",
-                    "type": "th",
-                  },
-                ],
-                "type": "tr",
-              },
-              "type": "thead",
-            },
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "children": Array [
-                  <tr
-                    className="row-gutters"
-                  >
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderImage
-                        offenderNo="offenderNo"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <OffenderName
-                        firstName="firstName"
-                        lastName="lastName"
-                      />
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      offenderNo
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <FormattedDate
-                        isoDate={undefined}
-                      />
-                    </td>
-                    <td>
-                      <HoursAndMinutes
-                        hhmmss="12:00"
-                      />
-                    </td>
-                    <td>
-                      reasonDescription
-                    </td>
-                    <td
-                      className="row-gutters"
-                    >
-                      <Flags
-                        alerts={
-                          Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ]
-                        }
-                        category=""
-                        offenderNo={undefined}
-                      />
-                    </td>
-                  </tr>,
-                ],
-              },
-              "ref": null,
-              "rendered": Array [
-                Object {
-                  "instance": null,
-                  "key": "offenderNo_reasonDescription_12:00",
-                  "nodeType": "host",
-                  "props": Object {
-                    "children": Array [
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderImage
-                          offenderNo="offenderNo"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        offenderNo
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <FormattedDate
-                          isoDate={undefined}
-                        />
-                      </td>,
-                      <td>
-                        <HoursAndMinutes
-                          hhmmss="12:00"
-                        />
-                      </td>,
-                      <td>
-                        reasonDescription
-                      </td>,
-                      <td
-                        className="row-gutters"
-                      >
-                        <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo={undefined}
-                        />
-                      </td>,
-                    ],
-                    "className": "row-gutters",
-                  },
-                  "ref": null,
-                  "rendered": Array [
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderImage
-                          offenderNo="offenderNo"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "offenderNo": "offenderNo",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <OffenderName
-                          firstName="firstName"
-                          lastName="lastName"
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "firstName": "firstName",
-                          "lastName": "lastName",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "offenderNo",
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": "offenderNo",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <FormattedDate
-                          isoDate={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "isoDate": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <HoursAndMinutes
-                          hhmmss="12:00"
-                        />,
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "hhmmss": "12:00",
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": "reasonDescription",
-                      },
-                      "ref": null,
-                      "rendered": "reasonDescription",
-                      "type": "td",
-                    },
-                    Object {
-                      "instance": null,
-                      "key": undefined,
-                      "nodeType": "host",
-                      "props": Object {
-                        "children": <Flags
-                          alerts={
-                            Array [
-                              "HA",
-                              "XSA",
-                              "XA",
-                              "PEEP",
-                              "XEL",
-                              "XRF",
-                              "XTACT",
-                            ]
-                          }
-                          category=""
-                          offenderNo={undefined}
-                        />,
-                        "className": "row-gutters",
-                      },
-                      "ref": null,
-                      "rendered": Object {
-                        "instance": null,
-                        "key": undefined,
-                        "nodeType": "function",
-                        "props": Object {
-                          "alerts": Array [
-                            "HA",
-                            "XSA",
-                            "XA",
-                            "PEEP",
-                            "XEL",
-                            "XRF",
-                            "XTACT",
-                          ],
-                          "category": "",
-                          "offenderNo": undefined,
-                        },
-                        "ref": null,
-                        "rendered": null,
-                        "type": [Function],
-                      },
-                      "type": "td",
-                    },
-                  ],
-                  "type": "tr",
-                },
-              ],
-              "type": "tbody",
-            },
-          ],
-          "type": "table",
-        },
-      ],
-      "type": Symbol(react.fragment),
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-        "legacyContextMode": "parent",
-        "lifecycles": Object {
-          "componentDidUpdate": Object {
-            "onSetState": true,
-          },
-          "getChildContext": Object {
-            "calledByRenderer": false,
-          },
-          "getDerivedStateFromError": true,
-          "getDerivedStateFromProps": Object {
-            "hasShouldComponentUpdateBug": true,
-          },
-          "getSnapshotBeforeUpdate": true,
-          "setState": Object {
-            "skipsComponentDidUpdateOnNullish": true,
-          },
-        },
-      },
-    },
-  },
-}
+            category=""
+          />
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</Fragment>
 `;
diff --git a/yarn.lock b/yarn.lock
index 4433504b3..eba418831 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4378,6 +4378,13 @@ enzyme-adapter-utils@^1.11.0:
     prop-types "^15.7.2"
     semver "^5.6.0"
 
+enzyme-to-json@^3.3.5:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.5.tgz#f8eb82bd3d5941c9d8bc6fd9140030777d17d0af"
+  integrity sha512-DmH1wJ68HyPqKSYXdQqB33ZotwfUhwQZW3IGXaNXgR69Iodaoj8TF/D9RjLdz4pEhGq2Tx2zwNUIjBuqoZeTgA==
+  dependencies:
+    lodash "^4.17.4"
+
 enzyme@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.9.0.tgz#2b491f06ca966eb56b6510068c7894a7e0be3909"