diff --git a/tests/test_image.py b/tests/test_image.py
index 8961a54..c4cf7ad 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -1,19 +1,48 @@
 # -*- coding:utf-8 -*-
 
 import os
+import pytest
+from PIL import Image
 
+from sigal import init_logging
 from sigal.image import generate_image, generate_thumbnail
 
 CURRENT_DIR = os.path.dirname(__file__)
 TEST_IMAGE = 'exo20101028-b-full.jpg'
+SRCFILE = os.path.join(CURRENT_DIR, 'sample', 'pictures', 'dir2', TEST_IMAGE)
 
 
-def test_image(tmpdir):
-    "Test the Image class."
+def test_generate_image(tmpdir):
+    "Test the generate_image function."
 
-    srcfile = os.path.join(CURRENT_DIR, 'sample', 'pictures', 'dir2',
-                           TEST_IMAGE)
     dstfile = str(tmpdir.join(TEST_IMAGE))
+    for size in [(600, 600), (300, 200)]:
+        generate_image(SRCFILE, dstfile, size, None, method='ResizeToFill')
+        im = Image.open(dstfile)
+        assert im.size == size
 
-    generate_thumbnail(srcfile, dstfile, (200, 150), None)
-    assert os.path.isfile(dstfile)
+
+def test_generate_image_processor(tmpdir):
+    "Test generate_image with a wrong processor name."
+
+    init_logging()
+    dstfile = str(tmpdir.join(TEST_IMAGE))
+    with pytest.raises(SystemExit):
+        generate_image(SRCFILE, dstfile, (200, 200), None,
+                       method='WrongMethod')
+
+
+def test_generate_thumbnail(tmpdir):
+    "Test the generate_thumbnail function."
+
+    dstfile = str(tmpdir.join(TEST_IMAGE))
+    for size in [(200, 150), (150, 200)]:
+        generate_thumbnail(SRCFILE, dstfile, size, None)
+        im = Image.open(dstfile)
+        assert im.size == size
+
+    for size, thumb_size in [((200, 150), (185, 150)),
+                             ((150, 200), (150, 122))]:
+        generate_thumbnail(SRCFILE, dstfile, size, None, fit=False)
+        im = Image.open(dstfile)
+        assert im.size == thumb_size