Small unit test improvements to get a little more code coverage