Fixed a few copy-and-paste-style errors in these classes; also increased
the readability of some of the error messages and added a few tests to
catch InvalidUUID errors and handle them appropriately