Updated unit tests to reflect module reorg