Reorg tests and slight clean-up