Refactor axis finding

After using it for a bit, it seemed to me that we should always fix the very common TR = 0 axis problem (at least by default).   Changed the code and tests to reflect this.