diff --git a/src/tests/eddn_message/commodity/3/valid-smallest-message.json b/src/tests/eddn_message/commodity/3/valid-smallest-message.json
new file mode 100644
index 0000000..c109d6e
--- /dev/null
+++ b/src/tests/eddn_message/commodity/3/valid-smallest-message.json
@@ -0,0 +1 @@
+{"$schemaRef":"https://eddn.edcd.io/schemas/commodity/3","header":{"softwareName":"E:D Market Connector Windows","softwareVersion":"5.3.0-beta4extra","uploaderID":"abcdefghijklm"},"message":{"systemName":"delphi","stationName":"The Oracle","marketId":128782803,"timestamp":"2022-01-26T12:00:00Z","commodities":[]}}
diff --git a/src/tests/eddn_message/invalid/invalid-JSON.json b/src/tests/eddn_message/invalid/invalid-JSON.json
new file mode 100644
index 0000000..de93807
--- /dev/null
+++ b/src/tests/eddn_message/invalid/invalid-JSON.json
@@ -0,0 +1,37 @@
+{]
+  "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
+  "header": {
+    "uploaderID": "Athanasius Testing",
+    "softwareName": "Athanasius Testing",
+    "softwareVersion": "v0.0.1"
+  },
+  "message": {
+    "timestamp":"2021-11-05T15:46:28Z",
+    "event":"Scan",
+    "ScanType":"AutoScan",
+    "BodyName":"Elphin",
+    "BodyID":1,
+    "Parents":[ {"Null":0} ],
+    "StarSystem":"Elphin",
+    "StarPos":[-30.12500,8.18750,-17.00000],
+    "SystemAddress":3932076118738,
+    "DistanceFromArrivalLS":0.000000,
+    "StarType":"K",
+    "Subclass":3,
+    "StellarMass":0.769531,
+    "Radius":587464832.000000,
+    "AbsoluteMagnitude":6.294067,
+    "Age_MY":9558,
+    "SurfaceTemperature":4796.000000,
+    "Luminosity":"V",
+    "SemiMajorAxis":1704360246658.325195,
+    "Eccentricity":0.348740,
+    "OrbitalInclination":-72.647343,
+    "Periapsis":86.347190,
+    "OrbitalPeriod":7189218699.932098,
+    "AscendingNode":0.000000,
+    "MeanAnomaly":351.262353,
+    "RotationPeriod":248957.736717,
+    "AxialTilt":-0.126915
+  }
+}
diff --git a/src/tests/eddn_message/invalid/invalid-outdated-schema.json b/src/tests/eddn_message/invalid/invalid-outdated-schema.json
new file mode 100644
index 0000000..16225dc
--- /dev/null
+++ b/src/tests/eddn_message/invalid/invalid-outdated-schema.json
@@ -0,0 +1,46 @@
+{
+  "$schemaRef": "http://schemas.elite-markets.net/eddn/commodity/2",
+  "message": {
+    "timestamp": "2022-01-06T11:19:27Z",
+    "systemName": "LP 98-132",
+    "stationName": "Freeport",
+    "marketId": 128008448,
+    "commodities": [
+      {
+        "name": "advancedcatalysers",
+        "meanPrice": 3039,
+        "buyPrice": 0,
+        "stock": 0,
+        "stockBracket": 0,
+        "sellPrice": 3756,
+        "demand": 936,
+        "demandBracket": 3
+      },
+      {
+        "name": "advancedmedicines",
+        "meanPrice": 1485,
+        "buyPrice": 0,
+        "stock": 0,
+        "stockBracket": 0,
+        "sellPrice": 1726,
+        "demand": 296,
+        "demandBracket": 3
+      },
+      {
+        "name": "advert1",
+        "meanPrice": 21542,
+        "buyPrice": 15267,
+        "stock": 0,
+        "stockBracket": 0,
+        "sellPrice": 15266,
+        "demand": 0,
+        "demandBracket": 0
+      }
+    ]
+  },
+  "header": {
+    "uploaderID": "Athanasius Testing",
+    "softwareName": "Athanasius Testing",
+    "softwareVersion": "v0.0.1"
+  }
+}
diff --git a/src/tests/eddn_message/invalid/scan-invalid-no-softwarename.json b/src/tests/eddn_message/invalid/scan-invalid-no-softwarename.json
new file mode 100644
index 0000000..a359890
--- /dev/null
+++ b/src/tests/eddn_message/invalid/scan-invalid-no-softwarename.json
@@ -0,0 +1,36 @@
+{
+  "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
+  "message": {
+    "timestamp":"2021-11-05T15:46:28Z",
+    "event":"Scan",
+    "ScanType":"AutoScan",
+    "BodyName":"Elphin",
+    "BodyID":1,
+    "Parents":[ {"Null":0} ],
+    "StarSystem":"Elphin",
+    "StarPos":[-30.12500,8.18750,-17.00000],
+    "SystemAddress":3932076118738,
+    "DistanceFromArrivalLS":0.000000,
+    "StarType":"K",
+    "Subclass":3,
+    "StellarMass":0.769531,
+    "Radius":587464832.000000,
+    "AbsoluteMagnitude":6.294067,
+    "Age_MY":9558,
+    "SurfaceTemperature":4796.000000,
+    "Luminosity":"V",
+    "SemiMajorAxis":1704360246658.325195,
+    "Eccentricity":0.348740,
+    "OrbitalInclination":-72.647343,
+    "Periapsis":86.347190,
+    "OrbitalPeriod":7189218699.932098,
+    "AscendingNode":0.000000,
+    "MeanAnomaly":351.262353,
+    "RotationPeriod":248957.736717,
+    "AxialTilt":-0.126915
+  },
+  "header": {
+    "uploaderID": "Athanasius Testing",
+    "softwareVersion": "v0.0.1"
+  }
+}
diff --git a/src/tests/eddn_message/journal/1/scan/valid.json b/src/tests/eddn_message/journal/1/scan/valid.json
new file mode 100644
index 0000000..b2a17eb
--- /dev/null
+++ b/src/tests/eddn_message/journal/1/scan/valid.json
@@ -0,0 +1,37 @@
+{
+  "$schemaRef": "https://eddn.edcd.io/schemas/journal/1",
+  "message": {
+    "timestamp":"2021-11-05T15:46:28Z",
+    "event":"Scan",
+    "ScanType":"AutoScan",
+    "BodyName":"Elphin",
+    "BodyID":1,
+    "Parents":[ {"Null":0} ],
+    "StarSystem":"Elphin",
+    "StarPos":[-30.12500,8.18750,-17.00000],
+    "SystemAddress":3932076118738,
+    "DistanceFromArrivalLS":0.000000,
+    "StarType":"K",
+    "Subclass":3,
+    "StellarMass":0.769531,
+    "Radius":587464832.000000,
+    "AbsoluteMagnitude":6.294067,
+    "Age_MY":9558,
+    "SurfaceTemperature":4796.000000,
+    "Luminosity":"V",
+    "SemiMajorAxis":1704360246658.325195,
+    "Eccentricity":0.348740,
+    "OrbitalInclination":-72.647343,
+    "Periapsis":86.347190,
+    "OrbitalPeriod":7189218699.932098,
+    "AscendingNode":0.000000,
+    "MeanAnomaly":351.262353,
+    "RotationPeriod":248957.736717,
+    "AxialTilt":-0.126915
+  },
+  "header": {
+    "uploaderID": "from Athanasius Testing",
+    "softwareName": "Athanasius Testing script",
+    "softwareVersion": "v0.0.1"
+  }
+}