Change test emails, remove try/except [MJ-706]