Fix email tests
Clean up tests