Try to fix email tenant tests for QA