adding proper format to global class and changing the mail for a test one