Tidy up test error handling, hopefully.
-rwxr-xr-x 26747 cdist