Reflect new modules structure in tests