Test coverage improvement

Added a whole bunch of tests, fixed some docs and edge cases.
I'm fine removing it.  Heck, the && might have had better performance than the ||.