diff --git a/deluge/tests/common.py b/deluge/tests/common.py
index 54cab32a4..bbe09dbf2 100644
--- a/deluge/tests/common.py
+++ b/deluge/tests/common.py
@@ -43,7 +43,7 @@ deluge.main.start_daemon()
     core = Popen([sys.executable], cwd=CWD, stdin=fp, stdout=PIPE, stderr=PIPE)
     while True:
         line = core.stderr.readline()
-        if "Factory starting on 58846" in line:
+        if "starting on 58846" in line:
             time.sleep(0.3) # Slight pause just incase
             break
         elif "Couldn't listen on localhost:58846" in line:
diff --git a/deluge/tests/google.ico b/deluge/tests/google.ico
deleted file mode 100644
index f594697d2..000000000
Binary files a/deluge/tests/google.ico and /dev/null differ
diff --git a/deluge/tests/google.png b/deluge/tests/google.png
new file mode 100644
index 000000000..553ad65ba
Binary files /dev/null and b/deluge/tests/google.png differ
diff --git a/deluge/tests/test_common.py b/deluge/tests/test_common.py
index a7425db36..3fbc658f0 100644
--- a/deluge/tests/test_common.py
+++ b/deluge/tests/test_common.py
@@ -56,3 +56,9 @@ class CommonTestCase(unittest.TestCase):
         self.failUnless(VersionSplit("0.14.9") == VersionSplit("0.14.9"))
         self.failUnless(VersionSplit("0.14.9") > VersionSplit("0.14.5"))
         self.failUnless(VersionSplit("0.14.10") >= VersionSplit("0.14.9"))
+        self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.3.900.dev123"))
+        self.failUnless(VersionSplit("1.3.2rc2.dev1") < VersionSplit("1.3.2-rc2"))
+        self.failUnless(VersionSplit("1.3.900.dev888") > VersionSplit("1.3.900.dev123"))
+        self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.4.0.dev123"))
+        self.failUnless(VersionSplit("1.4.0.dev1") < VersionSplit("1.4.0"))
+        self.failUnless(VersionSplit("1.4.0a1") < VersionSplit("1.4.0"))
diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py
index 4f8782d4f..c671b4f3e 100644
--- a/deluge/tests/test_tracker_icons.py
+++ b/deluge/tests/test_tracker_icons.py
@@ -24,7 +24,7 @@ class TrackerIconsTestCase(unittest.TestCase):
     def test_get_google_ico(self):
         # Google doesn't have any icon links
         # So instead we'll grab its favicon.ico
-        icon = TrackerIcon(os.path.join(dirname, "google.ico"))
+        icon = TrackerIcon(os.path.join(dirname, "google.png"))
         d = icons.get("www.google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
@@ -32,7 +32,7 @@ class TrackerIconsTestCase(unittest.TestCase):
 
     def test_get_google_ico_with_redirect(self):
         # google.com redirects to www.google.com
-        icon = TrackerIcon(os.path.join(dirname, "google.ico"))
+        icon = TrackerIcon(os.path.join(dirname, "google.png"))
         d = icons.get("google.com")
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
diff --git a/deluge/transfer.py b/deluge/transfer.py
index a09ad98a5..f27a65460 100644
--- a/deluge/transfer.py
+++ b/deluge/transfer.py
@@ -41,10 +41,11 @@ except ImportError:
 
 import zlib
 import struct
+import logging
 
 from twisted.internet.protocol import Protocol
 
-from deluge.log import LOG as log
+log = logging.getLogger(__name__)
 
 MESSAGE_HEADER_SIZE = 5