@@ 405,7 405,9 @@ def test_playercontrol():
     """Session: player control"""
 
     s, c = startandconnectserver()
-    p = startandconnectbong(s, c)
+    p = startandconnectbong(s, c, info_shufflemodes=['on', 'off'],
+                            info_repeatmodes=['off', 'track', 'list'],
+                            shuffle='on', repeat='off')
 
     c.snd("""
         - setvolume

          
@@ 416,7 418,24 @@ def test_playercontrol():
         - level: 33
     """)
 
-    # TODO: more of these
+    c.snd("""
+        - setplaying
+        - enabled: true
+
+        - setrepeat
+        - mode: track
+
+        - setshuffle
+        - mode: 'on'
+
+    """)
+    c.exp("""
+        - updateplaying
+        - enabled: true
+
+        - updaterepeat
+        - mode: track
+    """) # shuffle did not change -> no update
 
     c.disconnect()
     p.stop()