diff --git a/pytrainer/test/record_test.py b/pytrainer/test/record_test.py
index a0622f96..e580c91f 100644
--- a/pytrainer/test/record_test.py
+++ b/pytrainer/test/record_test.py
@@ -55,3 +55,26 @@ def test_hrFromLaps_handlingOfNone(self):
 		]
 
 		self.assertEqual(self.record.hrFromLaps(laps), (160, 180))
+		
+	def test_hrFromLaps_handlingOfBothAvgNone(self):
+		laps = [
+			{'elapsed_time': 300, 'avg_hr': None, 'max_hr': 180},
+			{'elapsed_time': 300, 'avg_hr': None, 'max_hr': 185}
+		]
+		self.assertEqual(self.record.hrFromLaps(laps), (0, 185))
+
+	def test_hrFromLaps_handlingOfBothMaxNone(self):
+		laps = [
+			{'elapsed_time': 300, 'avg_hr': 150, 'max_hr': None},
+			{'elapsed_time': 300, 'avg_hr': 160, 'max_hr': None}
+		]
+		self.assertEqual(self.record.hrFromLaps(laps), (155, 160))
+
+
+	def test_hrFromLaps_handlingOfBothNone(self):
+		laps = [
+			{'elapsed_time': 300, 'avg_hr': None, 'max_hr': None},
+			{'elapsed_time': 300, 'avg_hr': None, 'max_hr': None}
+		]
+		self.assertEqual(self.record.hrFromLaps(laps), (0, 0))
+