diff --git a/src/diana/tests/testSgfParser.py b/src/diana/tests/testSgfParser.py
--- a/src/diana/tests/testSgfParser.py
+++ b/src/diana/tests/testSgfParser.py
@@ -1,11 +1,12 @@
 from itertools import chain
+from datetime import date
 import unittest
 from unittest import TestCase
 import os
 
 from sgfParser import strRowCol
 from sgfParser.collection import Collection
-from sgfParser.property import Property
+from sgfParser.property import Property,DateProperty,DateException
 from sgfParser.propValues import text,compose
 
 
@@ -54,6 +55,29 @@ ghi]"""
 		self.assertEqual(str(parsed[1]), "abc:def")
 
 
+class TestDateProperty(TestCase):
+	def testSingle(self):
+		self.assertEqual(DateProperty.parseSingle("2019","Y")[1], date(2019,1,1))
+		self.assertEqual(DateProperty.parseSingle("2019-06","YM")[1], date(2019,6,1))
+		self.assertEqual(DateProperty.parseSingle("2019-06-22","YMD")[1], date(2019,6,22))
+		d=date(2019,6,21)
+		self.assertEqual(DateProperty.parseSingle("22","D",d)[1], date(2019,6,22))
+		self.assertEqual(DateProperty.parseSingle("07-22","MD",d)[1], date(2019,7,22))
+		self.assertEqual(DateProperty.parseSingle("2020-07-22","YMD",d)[1], date(2020,7,22))
+		with self.assertRaises(ValueError):
+			DateProperty.parseSingle("2019-31","YMD")
+
+	def testParse(self):
+		self.assertEqual(DateProperty("1996-05,06").value, [date(1996,5,1),date(1996,6,1)])
+		self.assertEqual(DateProperty("1996-05-06,07,08").value, [date(1996,5,6),date(1996,5,7),date(1996,5,8)])
+		self.assertEqual(DateProperty("1996,1997").value, [date(1996,1,1),date(1997,1,1)])
+		self.assertEqual(DateProperty("1996-12-27,28,1997-01-03,04").value, [date(1996,12,27),date(1996,12,28),date(1997,1,3),date(1997,1,4)])
+		self.assertEqual(DateProperty("1997-05-05,1997-05-06").value, [date(1997,5,5),date(1997,5,6)])
+		self.assertEqual(DateProperty("Published on 1997-05-06").value, [date(1997,5,6)])
+		with self.assertRaises(DateException):
+			DateProperty("unknown")
+
+
 class TestCollection(TestCase):
 	def testSubtrees(self):
 		c=Collection("""
@@ -64,8 +88,8 @@ class TestCollection(TestCase):
 		games=list(c.listGames())
 
 		self.assertEqual(len(games),2)
-		self.assertRegex(games[0].export(), r"^\(;B\[aa];(PB\[Some Black]|PW\[Some White]|W\[ab]){3};B\[ac]\)$")
-		self.assertRegex(games[1].export(), r"^\(;B\[aa];(PB\[Other Black]|PW\[Other White]|W\[bb]){3}\)$")
+		self.assertRegex(games[0].export(), r"^\(;B\[aa]\n;(PB\[Some Black]|PW\[Some White]|W\[ab]){3}\n;B\[ac]\n\)\n$")
+		self.assertRegex(games[1].export(), r"^\(;B\[aa]\n;(PB\[Other Black]|PW\[Other White]|W\[bb]){3}\n\)\n$")
 
 	def testEmptySgf(self):
 		Collection("(;)")