kubuntu-council team mailing list archive

[Dave Jones <mp+473755@xxxxxxxxxxxxxxxxxx>]

Dave Jones has proposed merging ~waveform/ubuntu-manual-tests:pi-server-changes into ubuntu-manual-tests:main.

Requested reviews:
  Ubuntu Testcase Admins (ubuntu-testcase)

For more details, see:
https://code.launchpad.net/~waveform/ubuntu-manual-tests/+git/ubuntu-manual-tests/+merge/473755

Various changes to the Pi server test cases that I noticed during the Oracular Beta testing. Each commit is a specific change to the definitions, with the last commit simply being the regeneration of the output.
-- 
Your team Ubuntu Testcase Admins is requested to review the proposed merge of ~waveform/ubuntu-manual-tests:pi-server-changes into ubuntu-manual-tests:main.

diff --git a/definitions/pi_server_cases.xml b/definitions/pi_server_cases.xml
index 54f6a4f..42ac3af 100644
--- a/definitions/pi_server_cases.xml
+++ b/definitions/pi_server_cases.xml
@@ -35,6 +35,17 @@
     </dd>
   </ut:test>
 
+  <ut:test id="running">
+    <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  </ut:test>
+
   <ut:test id="flash-kernel">
     <dt>
       Run <code>sudo flash-kernel</code>
@@ -170,6 +181,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
@@ -198,20 +210,19 @@
     <dt>
       With <ut:var name="device" />, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the <ut:var name="output" />:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the <ut:var name="output" /> (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 &quot;Jeff Wayne - War of the
+        <li>Find the correct card name for the <ut:var name="output" />:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the <ut:var name="output" /></li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 &quot;Jeff Wayne - War of the
           Worlds.mp3&quot;</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -224,6 +235,7 @@
   <ut:case id="1711_RaspberryPi 4 2GB Post-install">
     <ut:define name="model">Raspberry Pi 4 2GB</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -253,6 +265,7 @@
   <ut:case id="1719_RaspberryPi 4 4GB Post-install">
     <ut:define name="model">Raspberry Pi 4 4GB</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -282,6 +295,7 @@
   <ut:case id="1720_RaspberryPi 4 8GB Post-install">
     <ut:define name="model">Raspberry Pi 4 8GB</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -311,6 +325,7 @@
   <ut:case id="1721_RaspberryPi 3B+ Post-install">
     <ut:define name="model">Raspberry Pi 3B+</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -333,6 +348,7 @@
   <ut:case id="1722_RaspberryPi 3B Post-install">
     <ut:define name="model">Raspberry Pi 3B</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -355,6 +371,7 @@
   <ut:case id="1723_RaspberryPi 3A+ Post-install">
     <ut:define name="model">Raspberry Pi 3A+</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -376,6 +393,7 @@
   <ut:case id="1724_RaspberryPi 2 Post-install">
     <ut:define name="model">Raspberry Pi 2</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -395,6 +413,7 @@
 
   <ut:case id="1726_RaspberryPi CM3+ Post-install">
     <ut:define name="model">Raspberry Pi Compute Module 3+</ut:define>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -409,6 +428,7 @@
 
   <ut:case id="1727_RaspberryPi CM3+ Lite Post-install">
     <ut:define name="model">Raspberry Pi Compute Module 3+ Lite</ut:define>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -424,6 +444,7 @@
   <ut:case id="1740_RaspberryPi 400 Post-install">
     <ut:define name="model">Raspberry Pi 400</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -446,11 +467,7 @@
 
   <ut:case id="1741_RaspberryPi CM4 2GB Post-install">
     <ut:define name="model">Raspberry Pi Compute Module 4 2GB</ut:define>
-    <ut:define name="post-install">
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    </ut:define>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -473,11 +490,7 @@
 
   <ut:case id="1742_RaspberryPi CM4 4GB Post-install">
     <ut:define name="model">Raspberry Pi Compute Module 4 4GB</ut:define>
-    <ut:define name="post-install">
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    </ut:define>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -500,11 +513,7 @@
 
   <ut:case id="1777_RaspberryPi CM4 8GB Post-install">
     <ut:define name="model">Raspberry Pi Compute Module 4 8GB</ut:define>
-    <ut:define name="post-install">
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    </ut:define>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -533,6 +542,7 @@
         activity, but should otherwise remain lit.
       </ut:define>
     </ut:include>
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -547,9 +557,36 @@
     <ut:include ref="bluetooth" />
   </ut:case>
 
+  <ut:case id="1824_RaspberryPi 5 2GB Post-install">
+    <ut:define name="model">Raspberry Pi 5 2GB</ut:define>
+    <ut:include ref="power-led" />
+    <ut:include ref="running" />
+    <ut:include ref="flash-kernel" />
+    <ut:include ref="reboot" />
+    <ut:include ref="shutdown" />
+    <ut:include ref="ram-free"><ut:define name="mem">1.6-1.8GB</ut:define></ut:include>
+    <ut:include ref="usb-file-transfer" />
+    <ut:include ref="usb-keyboard"><ut:define name="usb">USB2 (black)</ut:define></ut:include>
+    <ut:include ref="usb-keyboard"><ut:define name="usb">USB3 (blue)</ut:define></ut:include>
+    <ut:include ref="audio">
+      <ut:define name="device">an HDMI monitor that supports audio plugged into
+      the HDMI0 output</ut:define>
+      <ut:define name="output">HDMI0 port</ut:define>
+    </ut:include>
+    <ut:include ref="audio">
+      <ut:define name="device">an HDMI monitor that supports audio plugged into
+      the HDMI1 output</ut:define>
+      <ut:define name="output">HDMI1 port</ut:define>
+    </ut:include>
+    <ut:include ref="ethernet"><ut:define name="intf">eth0</ut:define></ut:include>
+    <ut:include ref="wifi"><ut:define name="intf">wlan0</ut:define></ut:include>
+    <ut:include ref="bluetooth" />
+  </ut:case>
+
   <ut:case id="1793_RaspberryPi 5 4GB Post-install">
     <ut:define name="model">Raspberry Pi 5 4GB</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
@@ -575,6 +612,7 @@
   <ut:case id="1794_RaspberryPi 5 8GB Post-install">
     <ut:define name="model">Raspberry Pi 5 8GB</ut:define>
     <ut:include ref="power-led" />
+    <ut:include ref="running" />
     <ut:include ref="flash-kernel" />
     <ut:include ref="reboot" />
     <ut:include ref="shutdown" />
diff --git a/testcases/image/1711_RaspberryPi 4 2GB Post-install b/testcases/image/1711_RaspberryPi 4 2GB Post-install
index 29a5ddf..a14a58f 100644
--- a/testcases/image/1711_RaspberryPi 4 2GB Post-install
+++ b/testcases/image/1711_RaspberryPi 4 2GB Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -99,20 +109,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -126,20 +135,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -152,20 +160,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -222,6 +229,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1719_RaspberryPi 4 4GB Post-install b/testcases/image/1719_RaspberryPi 4 4GB Post-install
index e4c350a..560d7aa 100644
--- a/testcases/image/1719_RaspberryPi 4 4GB Post-install
+++ b/testcases/image/1719_RaspberryPi 4 4GB Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -99,20 +109,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -126,20 +135,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -152,20 +160,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -222,6 +229,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1720_RaspberryPi 4 8GB Post-install b/testcases/image/1720_RaspberryPi 4 8GB Post-install
index e9bf868..473bfcc 100644
--- a/testcases/image/1720_RaspberryPi 4 8GB Post-install
+++ b/testcases/image/1720_RaspberryPi 4 8GB Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -99,20 +109,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -126,20 +135,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -152,20 +160,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -222,6 +229,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1721_RaspberryPi 3B+ Post-install b/testcases/image/1721_RaspberryPi 3B+ Post-install
index 7d86774..4e3c9d6 100644
--- a/testcases/image/1721_RaspberryPi 3B+ Post-install
+++ b/testcases/image/1721_RaspberryPi 3B+ Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -90,20 +100,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -116,20 +125,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -186,6 +194,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1722_RaspberryPi 3B Post-install b/testcases/image/1722_RaspberryPi 3B Post-install
index a9fa390..cf084bd 100644
--- a/testcases/image/1722_RaspberryPi 3B Post-install
+++ b/testcases/image/1722_RaspberryPi 3B Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -90,20 +100,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -116,20 +125,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -186,6 +194,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1723_RaspberryPi 3A+ Post-install b/testcases/image/1723_RaspberryPi 3A+ Post-install
index c9de086..2269b88 100644
--- a/testcases/image/1723_RaspberryPi 3A+ Post-install
+++ b/testcases/image/1723_RaspberryPi 3A+ Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -90,20 +100,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -116,20 +125,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -171,6 +179,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1724_RaspberryPi 2 Post-install b/testcases/image/1724_RaspberryPi 2 Post-install
index 61dc8c4..8000863 100644
--- a/testcases/image/1724_RaspberryPi 2 Post-install
+++ b/testcases/image/1724_RaspberryPi 2 Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -90,20 +100,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -116,20 +125,19 @@
     <dt>
       With a pair of headphones with a 3.5mm jack, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the headphone jack:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the headphone jack (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the headphone jack:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the headphone jack</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
diff --git a/testcases/image/1726_RaspberryPi CM3+ Post-install b/testcases/image/1726_RaspberryPi CM3+ Post-install
index d404995..c069a71 100644
--- a/testcases/image/1726_RaspberryPi CM3+ Post-install
+++ b/testcases/image/1726_RaspberryPi CM3+ Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -12,6 +12,16 @@
       
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -81,20 +91,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
diff --git a/testcases/image/1727_RaspberryPi CM3+ Lite Post-install b/testcases/image/1727_RaspberryPi CM3+ Lite Post-install
index f159d81..8c65552 100644
--- a/testcases/image/1727_RaspberryPi CM3+ Lite Post-install
+++ b/testcases/image/1727_RaspberryPi CM3+ Lite Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -12,6 +12,16 @@
       
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -81,20 +91,19 @@
     <dt>
       With an HDMI monitor that supports audio, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
diff --git a/testcases/image/1740_RaspberryPi 400 Post-install b/testcases/image/1740_RaspberryPi 400 Post-install
index a0df411..1728bc0 100644
--- a/testcases/image/1740_RaspberryPi 400 Post-install
+++ b/testcases/image/1740_RaspberryPi 400 Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -83,20 +93,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -110,20 +119,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -180,6 +188,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1741_RaspberryPi CM4 2GB Post-install b/testcases/image/1741_RaspberryPi CM4 2GB Post-install
index 5607718..13a736d 100644
--- a/testcases/image/1741_RaspberryPi CM4 2GB Post-install
+++ b/testcases/image/1741_RaspberryPi CM4 2GB Post-install
@@ -1,21 +1,27 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
+    
     <p>This test case is to be carried out on a Raspberry Pi Compute Module 4 2GB.</p>
     <p>Follow the installation steps at <a href="https://ubuntu.com/download/iot/installation-media";>
       IoT installation media</a>
     </p>
-    
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    
     <dl>
       
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -78,20 +84,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -105,20 +110,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -175,6 +179,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1742_RaspberryPi CM4 4GB Post-install b/testcases/image/1742_RaspberryPi CM4 4GB Post-install
index f2b4a88..7970c01 100644
--- a/testcases/image/1742_RaspberryPi CM4 4GB Post-install
+++ b/testcases/image/1742_RaspberryPi CM4 4GB Post-install
@@ -1,21 +1,27 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
+    
     <p>This test case is to be carried out on a Raspberry Pi Compute Module 4 4GB.</p>
     <p>Follow the installation steps at <a href="https://ubuntu.com/download/iot/installation-media";>
       IoT installation media</a>
     </p>
-    
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    
     <dl>
       
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -78,20 +84,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -105,20 +110,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -175,6 +179,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1752_RaspberryPi Zero 2 Post-install b/testcases/image/1752_RaspberryPi Zero 2 Post-install
index 67a8d54..cb76175 100644
--- a/testcases/image/1752_RaspberryPi Zero 2 Post-install
+++ b/testcases/image/1752_RaspberryPi Zero 2 Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -24,6 +24,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -86,20 +96,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -141,6 +150,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1777_RaspberryPi CM4 8GB Post-install b/testcases/image/1777_RaspberryPi CM4 8GB Post-install
index 0184cac..8fa1a9b 100644
--- a/testcases/image/1777_RaspberryPi CM4 8GB Post-install
+++ b/testcases/image/1777_RaspberryPi CM4 8GB Post-install
@@ -1,21 +1,27 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
+    
     <p>This test case is to be carried out on a Raspberry Pi Compute Module 4 8GB.</p>
     <p>Follow the installation steps at <a href="https://ubuntu.com/download/iot/installation-media";>
       IoT installation media</a>
     </p>
-    
-      <p>Before booting your CM4 with the new image, edit config.txt on the boot
-      (1st) partition and uncomment the <code>#dtoverlay=dwc2,dr_mode=host</code>
-      line to ensure the USB ports on the IO board operate correctly</p>
-    
     <dl>
       
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -78,20 +84,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -105,20 +110,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -175,6 +179,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1793_RaspberryPi 5 4GB Post-install b/testcases/image/1793_RaspberryPi 5 4GB Post-install
index 86d8a6e..bc2c98b 100644
--- a/testcases/image/1793_RaspberryPi 5 4GB Post-install
+++ b/testcases/image/1793_RaspberryPi 5 4GB Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -99,20 +109,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -126,20 +135,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -196,6 +204,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1794_RaspberryPi 5 8GB Post-install b/testcases/image/1794_RaspberryPi 5 8GB Post-install
index d9dc003..6a0a905 100644
--- a/testcases/image/1794_RaspberryPi 5 8GB Post-install
+++ b/testcases/image/1794_RaspberryPi 5 8GB Post-install
@@ -1,6 +1,6 @@
 <!-- Please do not edit this file directly; it was generated with the
      tools/test_case_gen script using the following configuration as input:
-     ./definitions/pi_server_cases.xml
+     definitions/pi_server_cases.xml
 -->
 
     
@@ -21,6 +21,16 @@
   
     
     <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
       Run <code>sudo flash-kernel</code>
     </dt>
     <dd>
@@ -99,20 +109,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI0 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI0 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI0 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -126,20 +135,19 @@
       With an HDMI monitor that supports audio plugged into
       the HDMI1 output, and an available MP3 file:
       <ul>
-        <li>Install mpg321 and amixer with <code>sudo apt install mpg321
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
           alsa-utils</code></li>
-        <li>Find the correct hardware output for the HDMI1 port:
-          <code>cat /proc/asound/cards</code> and note the number at the start
-          of the line for the HDMI1 port (usually 0 and possibly
-          1 for any connected monitor(s), and 1 or possibly 2 for the headphone
-          jack)</li>
-        <li>Attempt to play your MP3 file with: <code>mpg321 -o alsa -a
-          hw:<em>num</em>,0 <em>music.mp3</em></code> substituting
-          <em>num</em> for the number found during the previous step, and
-          <em>music.mp3</em> for your choice of MP3 file, e.g. <code>mpg321 -o
-          alsa -a hw:0,0 "Jeff Wayne - War of the
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
           Worlds.mp3"</code></li>
-        <li>Use <tt>Ctrl+C</tt> to end playback early, if you wish</li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
         <li>If you cannot hear anything, first check that the mixer's volume is
           not set too low; run <code>alsamixer</code>, and adjust the volume
           (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
@@ -196,6 +204,7 @@
     <dt>
       Configure bluetooth, scan for, and pair, a device
       <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
         <li>Run <code>sudo bluetoothctl</code></li>
         <li>Check bluetoothctl prints <code>Agent registered</code></li>
         <li>Check the MAC address looks "real" (not some obviously blank
diff --git a/testcases/image/1824_RaspberryPi 5 2GB Post-install b/testcases/image/1824_RaspberryPi 5 2GB Post-install
new file mode 100644
index 0000000..d45707f
--- /dev/null
+++ b/testcases/image/1824_RaspberryPi 5 2GB Post-install
@@ -0,0 +1,239 @@
+<!-- Please do not edit this file directly; it was generated with the
+     tools/test_case_gen script using the following configuration as input:
+     definitions/pi_server_cases.xml
+-->
+
+    
+    <p>This test case is to be carried out on a Raspberry Pi 5 2GB.</p>
+    <p>Follow the installation steps at <a href="https://ubuntu.com/download/iot/installation-media";>
+      IoT installation media</a>
+    </p>
+    <dl>
+      
+    
+    <dt>
+      After powering on the machine, look at the power LED
+    </dt>
+    <dd>
+      The power LED illuminates and stays illuminated while the kernel continues
+      to boot. 
+    </dd>
+  
+    
+    <dt>
+      After logging in, run <code>systemctl status</code>, and look at the
+      "State:" reported at the top of the output
+    </dt>
+    <dd>
+      State should be reported as "running". In particular, it should
+      <em>not</em> read "degraded".
+    </dd>
+  
+    
+    <dt>
+      Run <code>sudo flash-kernel</code>
+    </dt>
+    <dd>
+      Exit code is clean (0) and no error messages are reported
+    </dd>
+  
+    
+    <dt>
+      Run <code>sudo reboot</code>
+    </dt>
+    <dd>
+      System reboots successfully to a login prompt
+    </dd>
+  
+    
+    <dt>
+      Run <code>sudo shutdown -h now</code>
+    </dt>
+    <dd>
+      System shuts down in a reasonable time (less than a minute)
+    </dd>
+  
+    
+    <dt>
+      Check output of <code>free -h</code>
+    </dt>
+    <dd>
+      Reported "Mem" under "total" is consistent with a
+      Raspberry Pi 5 2GB. It should be in the region of 1.6-1.8GB.
+    </dd>
+  
+    
+    <dt>
+      Perform a large (300-600MB) file copy to USB storage
+      <ul>
+        <li>Generate a large (500MB) file: <code>dd if=/dev/urandom of=rubbish
+          bs=1M count=500</code></li>
+        <li>Insert a USB stick (appropriately sized) into a spare USB port</li>
+        <li>Make a mount directory: <code>sudo mkdir /mnt/stick</code></li>
+        <li>Mount the stick: <code>sudo mount /dev/sda1 /mnt/stick</code>
+          (modify mount-point as necessary; check <code>sudo dmesg</code>
+          output if unsure)</li>
+        <li>Copy the file: <code>sudo cp rubbish /mnt/stick/</code></li>
+        <li>Unmount the stick: <code>sudo umount /mnt/stick</code></li>
+        <li>Remove the stick from the USB port</li>
+        <li>Re-insert the stick into the USB port</li>
+        <li>Re-mount the stick: <code>sudo mount /dev/sda1 /mnt/stick</code>
+          (again, adjust mount-point as necessary)</li>
+        <li>Compare the copied file to that on the stick: <code>cmp rubbish
+          /mnt/stick/rubbish</code></li>
+      </ul>
+    </dt>
+    <dd>
+      <code>cmp</code> returns 0 and outputs nothing, indicating the files are
+      identical
+    </dd>
+  
+    
+    <dt>
+      Connect a USB keyboard to one of the USB2 (black) ports
+    </dt>
+    <dd>
+      Verify that keys typed on the keyboard appear on the console
+    </dd>
+  
+    
+    <dt>
+      Connect a USB keyboard to one of the USB3 (blue) ports
+    </dt>
+    <dd>
+      Verify that keys typed on the keyboard appear on the console
+    </dd>
+  
+    
+    <dt>
+      With an HDMI monitor that supports audio plugged into
+      the HDMI0 output, and an available MP3 file:
+      <ul>
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
+          alsa-utils</code></li>
+        <li>Find the correct card name for the HDMI0 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI0 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
+          Worlds.mp3"</code></li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
+        <li>If you cannot hear anything, first check that the mixer's volume is
+          not set too low; run <code>alsamixer</code>, and adjust the volume
+          (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
+          (<tt>Esc</tt>) and retrying playback</li>
+      </ul>
+    </dt>
+    <dd>Audio can be heard through the device</dd>
+  
+    
+    <dt>
+      With an HDMI monitor that supports audio plugged into
+      the HDMI1 output, and an available MP3 file:
+      <ul>
+        <li>Install ffmpeg and amixer with <code>sudo apt install ffmpeg
+          alsa-utils</code></li>
+        <li>Find the correct card name for the HDMI1 port:
+          <code>cat /proc/asound/cards</code> and note the name in [brackets]
+          for the HDMI1 port</li>
+        <li>Attempt to play your MP3 file with: <code>ffmpeg -i
+          <em>music.mp3</em> -f alsa default:CARD=<em>name</em></code>
+          substituting <em>name</em> for the card name found during the
+          previous step, and <em>music.mp3</em> for your choice of MP3 file,
+          e.g. <code>mpg321 -o alsa -a hw:0,0 "Jeff Wayne - War of the
+          Worlds.mp3"</code></li>
+        <li>Use <tt>Ctrl+C</tt> or <tt>q</tt> to end playback early, if you
+          wish</li>
+        <li>If you cannot hear anything, first check that the mixer's volume is
+          not set too low; run <code>alsamixer</code>, and adjust the volume
+          (<tt>J</tt> for down, <tt>K</tt> for up) before exiting
+          (<tt>Esc</tt>) and retrying playback</li>
+      </ul>
+    </dt>
+    <dd>Audio can be heard through the device</dd>
+  
+    
+    <dt>
+      Check auto-configuration of ethernet
+      <ul>
+        <li>Run <code>ip addr</code></li>
+        <li>Check that a valid IP address is recorded on the eth0 interface</li>
+        <li>Check <code>ping google.com</code> successfully pings a few times
+          (<tt>Ctrl+C</tt> to cancel)</li>
+      </ul>
+    </dt>
+    <dd>
+      The "eth0" interface should have a DHCP
+      assigned IP address and you should be able to ping google.com
+    </dd>
+  
+    
+    <dt>
+      Configure wifi via netplan
+      <ul>
+        <li>Place the following in <code>/etc/netplan/wifi.yaml</code>
+        (substituting the SSID and password as necessary):</li>
+        <li><pre>
+      network:
+        version: 2
+          wifis:
+            wlan0:
+              dhcp4: true
+              access-points:
+                my-ssid-here:
+                  password: my-password-here</pre>
+        </li>
+        <li>Run <code>sudo netplan apply</code></li>
+        <li>Wait a few seconds (to allow DHCP to complete), then run <code>ip
+          addr</code></li>
+        <li>Check that a valid IP address is recorded on the wlan0 interface</li>
+        <li>Check <code>ping google.com</code> successfully pings a few times
+          (<tt>Ctrl+C</tt> to cancel)</li>
+      </ul>
+    </dt>
+    <dd>
+      The "wlan0" interface should have a DHCP
+      assigned IP address and you should be able to ping google.com
+    </dd>
+  
+    
+    <dt>
+      Configure bluetooth, scan for, and pair, a device
+      <ul>
+        <li>Install bluez with <code>sudo apt install bluez</code></li>
+        <li>Run <code>sudo bluetoothctl</code></li>
+        <li>Check bluetoothctl prints <code>Agent registered</code></li>
+        <li>Check the MAC address looks "real" (not some obviously blank
+          value like AA:AA:AA:AA:AA:AA)</li>
+        <li>Run <code>scan on</code></li>
+        <li>Make some other Bluetooth device visible for pairing (e.g. go into
+          Bluetooth settings on your Android phone)</li>
+        <li>Verify the other Bluetooth device appears in console output</li>
+          <li>Run <code>pair XX:XX:XX:XX:XX:XX</code>
+          where XX:XX:XX:XX:XX:XX is the other device's MAC address, as it
+          appears in scan output
+        </li>
+        <li>Verify the passcode on both devices</li>
+        <li>Check output includes "Pairing successful"</li>
+        <li>Disable scanning with <code>scan off</code></li>
+        <li>Exit tool with <code>quit</code></li>
+      </ul>
+    </dt>
+    <dd>
+      The Bluetooth interface should have a valid MAC address (not
+      AA:AA:AA:AA:AA:AA), can see and pair with another Bluetooth device.
+    </dd>
+  
+  
+    </dl>
+    <p>If <strong>all</strong> actions produce the expected results listed,
+      please <a href="results#add_result">submit</a> a 'passed' result.</p>
+    <p>If <strong>any</strong> action fails, or produces an unexpected result,
+      please <a href="results#add_result">submit</a> a 'failed' result and <a href="../../buginstructions">file a bug</a>. Please be sure to include
+      the bug number when you <a href="results#add_result">submit</a> your
+      result.</p>
+  
\ No newline at end of file