remaining characterizing tests and other edge cases covered. Publish-ready