-guestfish -c "test://$cwd/test.xml" --ro -d guest -x </dev/null >test.out 2>&1
-grep -sq '^add_drive_ro.*test.img' test.out
+../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest -x \
+ </dev/null >test.out 2>&1
+grep -sq '^add_drive.*test1.img.*readonly:true' test.out
+! grep -sq '^add_drive.*test1.img.*format' test.out
+grep -sq '^add_drive.*test2.img.*readonly:true.*format:raw' test.out
+grep -sq '^add_drive.*test3.img.*readonly:true.*format:qcow2' test.out