diff --git a/getwiki.py b/getwiki.py
index 395aac1..0c1db59 100644
--- a/getwiki.py
+++ b/getwiki.py
@@ -33,4 +33,4 @@ def get_wiki(language):
     img = imgs[0]
     img['src'] = 'http:'+img['src']
 
-    return img, text
+    return str(img), str(text)
diff --git a/sendmail.py b/sendmail.py
index 41288e4..1538d0e 100644
--- a/sendmail.py
+++ b/sendmail.py
@@ -10,7 +10,7 @@ from getwiki import get_wiki
 def send_email(img, text, email):
     unsubscribe_tag = f'<a href="https://daily-wiki-newsletter.herokuapp.com/unsubscribe/{email}">unsubscribe</a>'
 
-    msg = MIMEText(str(img) + 3*'<br>' + text + 3 *
+    msg = MIMEText(img + 3*'<br>' + text + 3 *
                    '<br>' + unsubscribe_tag, 'html')
     msg['Subject'] = 'today wiki'
     msg['From'] = 'daily-wiki@960.eu'
@@ -42,9 +42,16 @@ if __name__ == "__main__":
     languages = ["en", "de", "fr", "sv", "ja", "zh"]
     wikis = {}
     for language in languages:
-        img, text = get_wiki(language)
+        try:
+            img, text = get_wiki(language)
+        except:
+            print(f"Error getting article for {language}")
         wikis[language] = (img, text)
     data = firestore.getusers()
     for email in data:
         img, text = wikis[data[email]["language"]]
-        send_email(img, text, email)
+        try:
+            send_email(img, text, email)
+            print(f"Sent email to {email}")
+        except:
+            print(f"Email failed to send to {email}")

diff --git a/tests/test_getwiki.py b/tests/test_getwiki.py
new file mode 100644
index 0000000..ac45dae
--- /dev/null
+++ b/tests/test_getwiki.py
@@ -0,0 +1,28 @@
+import unittest
+from getwiki import get_wiki
+
+
+class TestFirestore(unittest.TestCase):
+
+    def test_get_wiki(self):
+        languages = ["en", "de", "fr", "sv", "ja", "zh"]
+        wikis = {}
+        for language in languages:
+            img, text = get_wiki(language)
+            wikis[language] = (img, text)
+        output = True
+        for key, value in wikis.items():
+            if output == False:
+                break
+            if not value[0].startswith('<img'):
+                print('\n\nNot an Image:'+value[0])
+            if len(value[1]) < 10:
+                print('\n\nShort Text:'+value[0])
+            self.assertIn(key, languages)
+            self.assertIsInstance(value, tuple)
+            self.assertIsInstance(value[0], str)
+            self.assertIsInstance(value[1], str)
+            self.assertTrue(len(value) == 2)
+
+    if __name__ == "__main__":
+        unittest.main()

fix email invalid
if one email is invalid throws error

`Traceback (most recent call last):
  File "sendmail.py", line 50, in <module>
    send_email(img, text, email)
  File "sendmail.py", line 21, in send_email
    s.sendmail(msg['From'], msg['To'], msg.as_string())
  File "/app/.heroku/python/lib/python3.6/smtplib.py", line 881, in sendmail
    raise SMTPRecipientsRefused(senderrs)
smtplib.SMTPRecipientsRefused: {'test@test.test': (450, b'4.1.2 <test@test.test>: Recipient address rejected: Domain not found')}
`
tests/test_getwiki.py::TestFirestore::test_get_wiki