diff --git a/tests/data/valid-statements/trust_invalid.json b/tests/data/valid-statements/alternative_address_valid.json
similarity index 56%
rename from tests/data/valid-statements/trust_invalid.json
rename to tests/data/valid-statements/alternative_address_valid.json
index 4d9cd322..ea614220 100644
--- a/tests/data/valid-statements/trust_invalid.json
+++ b/tests/data/valid-statements/alternative_address_valid.json
@@ -8,7 +8,12 @@
     "recordDetails": {
       "isComponent": false,
       "entityType": {
-        "type": "legalEntity"
+        "type": "registeredEntity",
+        "addresses":[
+          {
+            "address": "123"
+          }
+        ]
       }
     }
   },
@@ -22,22 +27,5 @@
       "isComponent": false,
       "personType": "knownPerson"
     }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "trustee"
-        }
-      ]
-    }
   }
 ]
diff --git a/tests/data/valid-statements/birthDate invalid.json b/tests/data/valid-statements/birthDate invalid.json
deleted file mode 100644
index d7589782..00000000
--- a/tests/data/valid-statements/birthDate invalid.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "2099-01-01"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/birthDate invalid2.json b/tests/data/valid-statements/birthDate invalid2.json
deleted file mode 100644
index 3e3dad63..00000000
--- a/tests/data/valid-statements/birthDate invalid2.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "2200"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/birthDate invalid3.json b/tests/data/valid-statements/birthDate invalid3.json
deleted file mode 100644
index 685789c2..00000000
--- a/tests/data/valid-statements/birthDate invalid3.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "1700"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/birthDate invalid4.json b/tests/data/valid-statements/birthDate invalid4.json
deleted file mode 100644
index 3dfc7034..00000000
--- a/tests/data/valid-statements/birthDate invalid4.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "1685-01"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/birthDate valid.json b/tests/data/valid-statements/birthDate valid.json
deleted file mode 100644
index 93285ba6..00000000
--- a/tests/data/valid-statements/birthDate valid.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "1997"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/birthDate valid2.json b/tests/data/valid-statements/birthDate valid2.json
deleted file mode 100644
index 7844d3fd..00000000
--- a/tests/data/valid-statements/birthDate valid2.json	
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson",
-      "birthDate": "1980-01-02"
-    }
-  }
-]
diff --git a/tests/data/valid-statements/trust_invalid2.json b/tests/data/valid-statements/trust_invalid2.json
deleted file mode 100644
index 7633c91e..00000000
--- a/tests/data/valid-statements/trust_invalid2.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "statementId": "1dc0e987-5c57-4a1c-b3ad-61353b66a9b7",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "c359f58d2977",
-    "recordType": "entity",
-    "recordDetails": {
-      "isComponent": false,
-      "entityType": {
-        "type": "arrangement"
-      }
-    }
-  },
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson"
-    }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "settlor"
-        }
-      ]
-    }
-  }
-]
diff --git a/tests/data/valid-statements/trust_invalid3.json b/tests/data/valid-statements/trust_invalid3.json
deleted file mode 100644
index 37a50f9a..00000000
--- a/tests/data/valid-statements/trust_invalid3.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "statementId": "1dc0e987-5c57-4a1c-b3ad-61353b66a9b7",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "c359f58d2977",
-    "recordType": "entity",
-    "recordDetails": {
-      "isComponent": false,
-      "entityType": {
-        "type": "arrangement"
-      }
-    }
-  },
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson"
-    }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "protector"
-        }
-      ]
-    }
-  }
-]
diff --git a/tests/data/valid-statements/trust_valid.json b/tests/data/valid-statements/trust_valid.json
deleted file mode 100644
index 810dc02c..00000000
--- a/tests/data/valid-statements/trust_valid.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-  {
-    "statementId": "1dc0e987-5c57-4a1c-b3ad-61353b66a9b7",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "c359f58d2977",
-    "recordType": "entity",
-    "recordDetails": {
-      "isComponent": false,
-      "entityType": {
-        "type": "arrangement",
-        "subtype": "trust"
-      }
-    }
-  },
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson"
-    }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "settlor"
-        }
-      ]
-    }
-  }
-]
diff --git a/tests/data/valid-statements/trust_valid2.json b/tests/data/valid-statements/trust_valid2.json
deleted file mode 100644
index a274d230..00000000
--- a/tests/data/valid-statements/trust_valid2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-  {
-    "statementId": "1dc0e987-5c57-4a1c-b3ad-61353b66a9b7",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "c359f58d2977",
-    "recordType": "entity",
-    "recordDetails": {
-      "isComponent": false,
-      "entityType": {
-        "type": "legalEntity",
-        "subtype": "trust"
-      }
-    }
-  },
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson"
-    }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "protector"
-        }
-      ]
-    }
-  }
-]
diff --git a/tests/data/valid-statements/trust_valid3.json b/tests/data/valid-statements/trust_valid3.json
deleted file mode 100644
index 6738b684..00000000
--- a/tests/data/valid-statements/trust_valid3.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-  {
-    "statementId": "1dc0e987-5c57-4a1c-b3ad-61353b66a9b7",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "c359f58d2977",
-    "recordType": "entity",
-    "recordDetails": {
-      "isComponent": false,
-      "entityType": {
-        "type": "legalEntity",
-        "subtype": "trust"
-      }
-    }
-  },
-  {
-    "statementId": "019a93f1-e470-42e9-957b-03559861b2e2",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "10478c6cf6de",
-    "recordType": "person",
-    "recordDetails": {
-      "isComponent": false,
-      "personType": "knownPerson"
-    }
-  },
-  {
-    "statementId": "fbfd0547-d0c6-4a00-b559-5c5e91c34f5c",
-    "declarationSubject": "c359f58d2977",
-    "statementDate": "2020-03-04",
-    "recordId": "93b53022ae6a",
-    "recordType": "relationship",
-    "recordDetails": {
-      "isComponent": false,
-      "subject": "c359f58d2977",
-      "interestedParty": "10478c6cf6de",
-      "interests":[
-        {
-          "type": "trustee"
-        }
-      ]
-    }
-  }
-]