more improvements to #114 test coverage
2 files changed