Minor test reorg
Couple more unit tests