diff --git a/tests/model/test_beacon.py b/tests/model/test_beacon.py
index 2264d24..0918471 100644
--- a/tests/model/test_beacon.py
+++ b/tests/model/test_beacon.py
@@ -5,6 +5,11 @@ from ogn.model.beacon import Beacon
 
 
 class TestStringMethods(unittest.TestCase):
+    def test_fail_validation(self):
+        beacon = Beacon()
+        with self.assertRaises(Exception):
+            beacon.parse("notAValidString")
+
     def test_basic(self):
         beacon = Beacon()
 
diff --git a/tests/model/test_receiver.py b/tests/model/test_receiver.py
index 30730ae..e762551 100644
--- a/tests/model/test_receiver.py
+++ b/tests/model/test_receiver.py
@@ -4,17 +4,27 @@ from ogn.model.receiver import Receiver
 
 
 class TestStringMethods(unittest.TestCase):
-    def test_basic(self):
+    def test_v022(self):
         receiver = Receiver()
 
-        receiver.parse("v0.2.2 CPU:0.8 RAM:695.7/4025.5MB NTP:16000.0ms/+0.0ppm +63.0C")
+        receiver.parse("v0.2.2 CPU:0.5 RAM:669.9/887.7MB NTP:1.0ms/+6.2ppm +52.0C RF:+0.06dB")
         self.assertEqual(receiver.version, '0.2.2')
-        self.assertEqual(receiver.cpu_load, 0.8)
-        self.assertEqual(receiver.cpu_temp, 63.0)
-        self.assertEqual(receiver.free_ram, 695.7)
-        self.assertEqual(receiver.total_ram, 4025.5)
-        self.assertEqual(receiver.ntp_error, 16000.0)
+        self.assertEqual(receiver.cpu_load, 0.5)
+        self.assertEqual(receiver.cpu_temp, 52.0)
+        self.assertEqual(receiver.free_ram, 669.9)
+        self.assertEqual(receiver.total_ram, 887.7)
+        self.assertEqual(receiver.ntp_error, 1.0)
         self.assertEqual(receiver.rec_crystal_correction, 0.0)
+        self.assertEqual(receiver.rec_crystal_correction_fine, 0.0)
+        self.assertEqual(receiver.rec_input_noise, 0.06)
+
+    def test_v021(self):
+        receiver = Receiver()
+
+        receiver.parse("v0.2.1 CPU:0.8 RAM:25.6/458.9MB NTP:0.0ms/+0.0ppm +51.9C RF:+26-1.4ppm/-0.25dB")
+        self.assertEqual(receiver.rec_crystal_correction, 26)
+        self.assertEqual(receiver.rec_crystal_correction_fine, -1.4)
+        self.assertEqual(receiver.rec_input_noise, -0.25)
 
 
 if __name__ == '__main__':