Reorg for testability
Expand integration testing of changes