diff --git a/test/test_call_signatures.py b/test/test_call_signatures.py
index 392078f6..c76dcc8c 100644
--- a/test/test_call_signatures.py
+++ b/test/test_call_signatures.py
@@ -4,78 +4,82 @@ from .base import unittest
 from jedi import Script
 
 class TestCallSignatures(unittest.TestCase):
-    def assert_call_def(self, call_defs, name, index):
+    def _assert_call_def(self, call_defs, name, index):
+        # just for the sake of this simple comparison
         assert len(call_defs) <= 1
-        call_def = call_defs[0] if len(call_defs) else None
-        self.assertEqual(
-            {'call_name': getattr(call_def, 'call_name', None),
-             'index': getattr(call_def, 'index', None)},
-            {'call_name': name, 'index': index},
-        )
 
-    def test_function_definition(self):
-        check = self.assert_call_def
+        if not call_defs:
+            assert name is None
+        else:
+            assert call_defs[0].call_name == name
+            assert call_defs[0].index == index
+
+    def test_call_signatures(self):
+        def _run(source, expected_name, expected_index=0, column=None, line=None):
+            signatures = Script(source, line, column).call_signatures()
+            self._assert_call_def(signatures, expected_name, expected_index)
+
+        def run(source, name, index=0, column=None, line=1):
+            _run(source, name, index, column, line)
 
         # simple
-        s = "abs(a, str("
+        s1 = "abs(a, str("
+        run(s1, 'abs', 0, 4)
+        run(s1, 'abs', 1, 6)
+        run(s1, 'abs', 1, 7)
+        run(s1, 'abs', 1, 8)
+        run(s1, 'str', 0, 11)
+
         s2 = "abs(), "
+        run(s2, 'abs', 0, 4)
+        run(s2, None, column=5)
+        run(s2, None)
+
         s3 = "abs()."
+        run(s3, None, column=5)
+        run(s3, None)
+
         # more complicated
         s4 = 'abs(zip(), , set,'
+        run(s4, None, column=3)
+        run(s4, 'abs', 0, 4)
+        run(s4, 'zip', 0, 8)
+        run(s4, 'abs', 0, 9)
+        #run(s4, 'abs', 1, 10)
+
+
         s5 = "abs(1,\nif 2:\n def a():"
+        print Script(s5, 1, 4).call_signatures()
+        #check(self.function_definition(s5, (1, 6)), 'abs', 1)
+        run(s5, 'abs', 0, 4)
+        run(s5, 'abs', 1, 6)
+
         s6 = "str().center("
+        run(s6, 'center', 0)
+        run(s6, 'str', 0, 4)
+
         s7 = "str().upper().center("
         s8 = "str(int[zip("
+        run(s7, 'center', 0)
+        run(s8, 'zip', 0)
+        run(s8, 'str', 0, 8)
 
-        check(self.function_definition(s, (1, 4)), 'abs', 0)
-        check(self.function_definition(s, (1, 6)), 'abs', 1)
-        check(self.function_definition(s, (1, 7)), 'abs', 1)
-        check(self.function_definition(s, (1, 8)), 'abs', 1)
-        check(self.function_definition(s, (1, 11)), 'str', 0)
-
-        check(self.function_definition(s2, (1, 4)), 'abs', 0)
-        assert self.function_definition(s2, (1, 5)) is None
-        assert self.function_definition(s2) is None
-
-        assert self.function_definition(s3, (1, 5)) is None
-        assert self.function_definition(s3) is None
-
-        assert self.function_definition(s4, (1, 3)) is None
-        check(self.function_definition(s4, (1, 4)), 'abs', 0)
-        check(self.function_definition(s4, (1, 8)), 'zip', 0)
-        check(self.function_definition(s4, (1, 9)), 'abs', 0)
-        #check(self.function_definition(s4, (1, 10)), 'abs', 1)
-
-        check(self.function_definition(s5, (1, 4)), 'abs', 0)
-        check(self.function_definition(s5, (1, 6)), 'abs', 1)
-
-        check(self.function_definition(s6), 'center', 0)
-        check(self.function_definition(s6, (1, 4)), 'str', 0)
-
-        check(self.function_definition(s7), 'center', 0)
-        check(self.function_definition(s8), 'zip', 0)
-        check(self.function_definition(s8, (1, 8)), 'str', 0)
-
-        s = "import time; abc = time; abc.sleep("
-        check(self.function_definition(s), 'sleep', 0)
+        run("import time; abc = time; abc.sleep(", 'sleep', 0)
 
         # jedi-vim #9
-        s = "with open("
-        check(self.function_definition(s), 'open', 0)
+        run("with open(", 'open', 0)
 
         # jedi-vim #11
-        s1 = "for sorted("
-        check(self.function_definition(s1), 'sorted', 0)
-        s2 = "for s in sorted("
-        check(self.function_definition(s2), 'sorted', 0)
+        run("for sorted(", 'sorted', 0)
+        run("for s in sorted(", 'sorted', 0)
 
         # jedi #57
         s = "def func(alpha, beta): pass\n" \
             "func(alpha='101',"
-        check(self.function_definition(s, (2, 13)), 'func', 0)
+        run(s, 'func', 0, column=13, line=2)
 
     def test_function_definition_complex(self):
-        check = self.assert_call_def
+        check = self._assert_call_def
 
         s = """
                 def abc(a,b):
@@ -87,20 +91,20 @@ class TestCallSignatures(unittest.TestCase):
                 if 1:
                     pass
             """
-        check(self.function_definition(s, (6, 24)), 'abc', 0)
+        check(Script(s, 6, 24).call_signatures(), 'abc', 0)
         s = """
                 import re
                 def huhu(it):
                     re.compile(
                     return it * 2
             """
-        check(self.function_definition(s, (4, 31)), 'compile', 0)
+        check(Script(s, 4, 31).call_signatures(), 'compile', 0)
         # jedi-vim #70
         s = """def foo("""
-        assert self.function_definition(s) is None
+        assert Script(s).call_signatures() == []
         # jedi-vim #116
         s = """import functools; test = getattr(functools, 'partial'); test("""
-        check(self.function_definition(s), 'partial', 0)
+        check(Script(s).call_signatures(), 'partial', 0)
 
     def test_call_signature_on_module(self):
         """github issue #240"""
@@ -114,4 +118,4 @@ class TestCallSignatures(unittest.TestCase):
             pass
         f( )""")
         call_defs = Script(s, 3, 3).call_signatures()
-        self.assert_call_def(call_defs, 'f', 0)
+        self._assert_call_def(call_defs, 'f', 0)