Merge pull request #277 from evansb/clean-test
Miscellaneous Fixes

(main@7c6e71162b14736563e3e3de0b8483615d55e788)