diff --git a/bob/bio/vein/tests/test.py b/bob/bio/vein/tests/test.py
index 4c18c6e4369ba14911939a3ace7815f8612f5a74..277c21d7ea0f5abab2bf7243737590f3480b48f5 100644
--- a/bob/bio/vein/tests/test.py
+++ b/bob/bio/vein/tests/test.py
@@ -75,7 +75,7 @@ def test_finger_crop():
 
   img = bob.io.base.load(input_filename)
 
-  from bob.bio.vein.preprocessors.FingerCrop import FingerCrop
+  from bob.bio.vein.preprocessor.FingerCrop import FingerCrop
   preprocess = FingerCrop(fingercontour='leemaskMatlab', padding_width=0)
 
   preproc, mask = preprocess(img)
@@ -105,7 +105,7 @@ def test_miuramax():
   input_fvr = bob.io.base.load(input_fvr_filename)
 
   # Apply Python implementation
-  from bob.bio.vein.extractors.MaximumCurvature import MaximumCurvature
+  from bob.bio.vein.extractor.MaximumCurvature import MaximumCurvature
   MC = MaximumCurvature(5)
   output_img = MC((input_img, input_fvr))
 
@@ -130,7 +130,7 @@ def test_miurarlt():
   input_fvr = bob.io.base.load(input_fvr_filename)
 
   # Apply Python implementation
-  from bob.bio.vein.extractors.RepeatedLineTracking import RepeatedLineTracking
+  from bob.bio.vein.extractor.RepeatedLineTracking import RepeatedLineTracking
   RLT = RepeatedLineTracking(3000, 1, 21, False)
   output_img = RLT((input_img, input_fvr))
 
@@ -155,7 +155,7 @@ def test_huangwl():
   input_fvr = bob.io.base.load(input_fvr_filename)
 
   # Apply Python implementation
-  from bob.bio.vein.extractors.WideLineDetector import WideLineDetector
+  from bob.bio.vein.extractor.WideLineDetector import WideLineDetector
   WL = WideLineDetector(5, 1, 41, False)
   output_img = WL((input_img, input_fvr))
 
@@ -178,7 +178,7 @@ def test_miura_match():
   probe_gen_vein = bob.io.base.load(probe_gen_filename)
   probe_imp_vein = bob.io.base.load(probe_imp_filename)
 
-  from bob.bio.vein.algorithms.MiuraMatch import MiuraMatch
+  from bob.bio.vein.algorithm.MiuraMatch import MiuraMatch
   MM = MiuraMatch(ch=18, cw=28)
   score_gen = MM.score(template_vein, probe_gen_vein)
 
diff --git a/bob/bio/vein/tests/test_databases.py b/bob/bio/vein/tests/test_databases.py
index 4e05beb3264c6911b2be43e6eee835f0363ee4cb..3903a351645c77b2781a6ff2922c2a7ba6f9c73d 100644
--- a/bob/bio/vein/tests/test_databases.py
+++ b/bob/bio/vein/tests/test_databases.py
@@ -1,22 +1,6 @@
 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
-# @author: Manuel Guenther <Manuel.Guenther@idiap.ch>
-# @date: Thu May 24 10:41:42 CEST 2012
-#
-# Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+# Thu May 24 10:41:42 CEST 2012
 
 from nose.plugins.skip import SkipTest