diff --git a/osaca/api/kerncraft_interface.py b/osaca/api/kerncraft_interface.py
index 28a1894..e31ddac 100755
--- a/osaca/api/kerncraft_interface.py
+++ b/osaca/api/kerncraft_interface.py
@@ -63,7 +63,7 @@ class KerncraftAPI(object):
         return max(self.semantics.get_throughput_sum(self.kernel))
 
     def get_latency(self):
-        return (self.get_lcd(self.kernel), self.get_cp(self.kernel))
+        return (self.get_lcd(), self.get_cp())
 
     def get_cp(self):
         kernel_graph = KernelDG(self.kernel, self.parser, self.machine_model)
diff --git a/tests/test_kerncraftAPI.py b/tests/test_kerncraftAPI.py
index ec7b27b..224c58f 100755
--- a/tests/test_kerncraftAPI.py
+++ b/tests/test_kerncraftAPI.py
@@ -28,11 +28,10 @@ class TestKerncraftAPI(unittest.TestCase):
     ###########
 
     def test_kerncraft_API_x86(self):
-        kapi = KerncraftAPI('csx')
-        kernel = kapi.analyze_code(self.code_x86)
+        kapi = KerncraftAPI('csx', self.code_x86)
 
-        kapi.create_output(kernel)
-        self.assertEqual(kapi.get_unmatched_instruction_ratio(kernel), 0.0)
+        kapi.create_output()
+        self.assertEqual(kapi.get_unmatched_instruction_ratio(), 0.0)
         port_occupation = OrderedDict(
             [
                 ('0', 1.25),
@@ -48,16 +47,15 @@ class TestKerncraftAPI(unittest.TestCase):
                 ('7', 0.0),
             ]
         )
-        self.assertEqual(kapi.get_port_occupation_cycles(kernel), port_occupation)
-        self.assertEqual(kapi.get_total_throughput(kernel), 2.0)
-        self.assertEqual(kapi.get_latency(kernel), (1.0, 13.0))
+        self.assertEqual(kapi.get_port_occupation_cycles(), port_occupation)
+        self.assertEqual(kapi.get_total_throughput(), 2.0)
+        self.assertEqual(kapi.get_latency(), (1.0, 13.0))
 
     def test_kerncraft_API_AArch64(self):
-        kapi = KerncraftAPI('vulcan')
-        kernel = kapi.analyze_code(self.code_AArch64)
+        kapi = KerncraftAPI('vulcan', self.code_AArch64)
 
-        kapi.create_output(kernel)
-        self.assertEqual(kapi.get_unmatched_instruction_ratio(kernel), 0.0)
+        kapi.create_output()
+        self.assertEqual(kapi.get_unmatched_instruction_ratio(), 0.0)
         port_occupation = OrderedDict(
             [
                 ('0', 34.0),
@@ -70,8 +68,8 @@ class TestKerncraftAPI(unittest.TestCase):
                 ('5', 32.0),
             ]
         )
-        self.assertEqual(kapi.get_port_occupation_cycles(kernel), port_occupation)
-        self.assertEqual(kapi.get_total_throughput(kernel), 64.0)
+        self.assertEqual(kapi.get_port_occupation_cycles(), port_occupation)
+        self.assertEqual(kapi.get_total_throughput(), 64.0)
         # TODO add missing latency values
         # self.assertEqual(kapi.get_latency(kernel), 20.0)