diff -u b/tests/Drupal/pgn/Tests/PgnEncoderUnitTest.php b/tests/Drupal/pgn/Tests/PgnEncoderUnitTest.php
--- b/tests/Drupal/pgn/Tests/PgnEncoderUnitTest.php
+++ b/tests/Drupal/pgn/Tests/PgnEncoderUnitTest.php
@@ -69,4 +69,19 @@
             ),
           ),
+          array(
+            'tags' => array(
+              'Event' => '?',
+              'Site' => '?',
+              'Date' => '????.??.??',
+              'Round' => '?',
+              'White' => '?',
+              'Black' => '?',
+              'Result' => '*',
+            ),
+            'movetext' => array(
+              1 => array('e4', 'f5'),
+              2 => array('Qh5+'),
+            ),
+          ),
         ),
         'e4f5Dh5.pgn',