REF/TST: collect misplaced tests
ATM we are mixing/matching pytest vs UnitTest idioms, which is confusing for me because I have to track down both inheritance and fixtures.  So I'm trying to clean this up, leading to some yak shaving.
