more improvements to #114 test coverage