Improved test coverage for changes provided by charliefarley