[WIP] Fixing email controller tests to work with API Module.