Small tweaks to output, and hard-code the test UUID.