More unit test coverage...pretty minor, but worth the easy to add improvement