diff --git a/tests/benchmark_test.py b/tests/benchmark_test.py
index ebdf4681..2b07578a 100644
--- a/tests/benchmark_test.py
+++ b/tests/benchmark_test.py
@@ -1,7 +1,6 @@
 import numpy as np
 import pyerrors as pe
 import pytest
-import time
 
 np.random.seed(0)
 
diff --git a/tests/obs_test.py b/tests/obs_test.py
index 548f1a42..9bb508b4 100644
--- a/tests/obs_test.py
+++ b/tests/obs_test.py
@@ -1,7 +1,5 @@
 import autograd.numpy as np
 import os
-import random
-import string
 import copy
 import pyerrors as pe
 import pytest
@@ -142,7 +140,7 @@ def test_overloading_vectorization():
     assert [o.value for o in b / a] == [o.value for o in [b / p for p in a]]
 
 
-def test_gamma_method():
+def test_gamma_method_standard_data():
     for data in [np.tile([1, -1], 1000),
                  np.random.rand(100001),
                  np.zeros(1195),
@@ -285,7 +283,7 @@ def test_covariance_symmetry():
     assert np.abs(cov_ab) < test_obs1.dvalue * test_obs2.dvalue * (1 + 10 * np.finfo(np.float64).eps)
 
 
-def test_gamma_method():
+def test_gamma_method_uncorrelated():
     # Construct pseudo Obs with random shape
     value = np.random.normal(5, 10)
     dvalue = np.abs(np.random.normal(0, 1))
diff --git a/tests/sfcf_in_test.py b/tests/sfcf_in_test.py
index 20a3e924..86ff6cd6 100644
--- a/tests/sfcf_in_test.py
+++ b/tests/sfcf_in_test.py
@@ -1,14 +1,14 @@
-import os,sys,inspect
+import os
+import sys
+import inspect
+import pyerrors as pe
+import pyerrors.input.sfcf as sfin
+import shutil
+
 current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
 parent_dir = os.path.dirname(current_dir)
 sys.path.insert(0, parent_dir)
 
-import pyerrors as pe
-import pyerrors.input.openQCD as qcdin
-import pyerrors.input.sfcf as sfin
-import shutil
-
-from time import sleep
 
 def build_test_environment(env_type, cfgs, reps):
     if env_type == "o":
@@ -26,7 +26,6 @@ def build_test_environment(env_type, cfgs, reps):
 
 
 
-
 def clean_test_environment(env_type, cfgs, reps):
     if env_type == "o":
         for i in range(1,reps):
@@ -39,7 +38,7 @@ def clean_test_environment(env_type, cfgs, reps):
         for i in range(2,cfgs+1):
             os.remove("tests/data/sfcf_test/data_c/data_c_r0/data_c_r0_n"+str(i))
 
-        
+
 def test_o_bb():
     build_test_environment("o",5,3)
     f_1 = sfin.read_sfcf("tests/data/sfcf_test/data_o", "test", "f_1",quarks="lquark lquark", wf = 0, wf2=0, version = "2.0", corr_type="bb")
@@ -47,7 +46,7 @@ def test_o_bb():
     clean_test_environment("o",5,3)
     assert len(f_1) == 1
     assert f_1[0].value == 351.1941525454502
-        
+
 def test_o_bi():
     build_test_environment("o",5,3)
     f_A = sfin.read_sfcf("tests/data/sfcf_test/data_o", "test", "f_A",quarks="lquark lquark", wf = 0, version = "2.0")
@@ -57,7 +56,7 @@ def test_o_bi():
     assert f_A[0].value == 65.4711887279723
     assert f_A[1].value == 1.0447210336915187
     assert f_A[2].value == -41.025094911185185
-            
+
 def test_o_bib():
     build_test_environment("o",5,3)
     f_V0 = sfin.read_sfcf("tests/data/sfcf_test/data_o", "test", "F_V0",quarks="lquark lquark", wf = 0, wf2 = 0, version = "2.0", corr_type="bib")
@@ -122,4 +121,4 @@ def test_a_bib():
     assert len(f_V0) == 3
     assert f_V0[0] == 683.6776090085115
     assert f_V0[1] == 661.3188585582334
-    assert f_V0[2] == 683.6776090081005
\ No newline at end of file
+    assert f_V0[2] == 683.6776090081005