remove condition added to make tests fail - error fixed on unbuntu
change email options