Tests work after code reorg