diff --git a/app/models/advertisement.rb b/app/models/advertisement.rb
index b1198e0ce..ed00e8c77 100644
--- a/app/models/advertisement.rb
+++ b/app/models/advertisement.rb
@@ -74,7 +74,7 @@ class Advertisement < ActiveRecord::Base
     if width > 100 || height > 100
       if height < width
         ratio = 100.0 / width
-        return (height * ratio)
+        return (height * ratio).to_i
       else
         return 100
       end
diff --git a/public/images/advertisements/1283209929934.jpg b/public/images/advertisements/1283209929934.jpg
deleted file mode 100644
index eda742e13..000000000
Binary files a/public/images/advertisements/1283209929934.jpg and /dev/null differ
diff --git a/test/unit/advertisement_test.rb b/test/unit/advertisement_test.rb
index 9c2d03c5e..e8e2555f4 100644
--- a/test/unit/advertisement_test.rb
+++ b/test/unit/advertisement_test.rb
@@ -2,15 +2,27 @@ require 'test_helper'
 
 class AdvertisementTest < ActiveSupport::TestCase
   context "An advertisement" do
+    setup do
+      @ad = Factory.create(:advertisement, :file => upload_jpeg("#{Rails.root}/test/files/test.jpg"))
+    end
+    
+    teardown do
+      FileUtils.rm_f(Dir.glob("#{Rails.root}/public/images/advertisements/*.jpg"))
+    end
+    
     should "create new hit records" do
-      ad = Factory.create(:advertisement)
       assert_difference("AdvertisementHit.count") do
-        ad.hit!("0.0.0.0")
+        @ad.hit!("0.0.0.0")
       end
       assert_equal("0.0.0.0", AdvertisementHit.first.ip_addr)
       assert_equal(1, AdvertisementHit.first.advertisement_id)
-      assert_equal(1, ad.hit_sum(1.day.ago, 1.day.from_now))
-      assert_equal(0, ad.hit_sum(2.days.ago, 1.day.ago))
+      assert_equal(1, @ad.hit_sum(1.day.ago, 1.day.from_now))
+      assert_equal(0, @ad.hit_sum(2.days.ago, 1.day.ago))
+    end
+    
+    should "know its preview height and preview width" do
+      assert_equal(100, @ad.preview_width)
+      assert_equal(67, @ad.preview_height)
     end
   end
 end