diff --git a/requirements.txt b/requirements.txt
index 64cc19c9..5cc6e3d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -54,7 +54,7 @@ scandir==1.5
 simplegeneric==0.8.1
 singledispatch==3.4.0.3
 six==1.11.0
-swaggapi==0.6.0
+swaggapi==0.6.3
 termcolor==1.1.0
 traitlets==4.3.2
 Twisted==17.5.0
diff --git a/setup.py b/setup.py
index a8e53533..e0c1bd03 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 """Setup file for handling packaging and distribution."""
 from setuptools import setup, find_packages
 
-__version__ = "4.2.1"
+__version__ = "4.2.2"
 
 result_handlers = [
     "db = rotest.core.result.handlers.db_handler:DBHandler",
diff --git a/src/rotest/cli/discover.py b/src/rotest/cli/discover.py
index 843f7014..c0a135a8 100644
--- a/src/rotest/cli/discover.py
+++ b/src/rotest/cli/discover.py
@@ -11,7 +11,7 @@
 
 
 BLACK_LIST = [".tox", ".git", ".idea", "setup.py"]
-WHITE_LIST = ["*test*.py"]
+WHITE_LIST = ["*.py"]
 
 
 def is_test_class(test):
diff --git a/src/rotest/core/flow_component.py b/src/rotest/core/flow_component.py
index 3a052fdc..79b4c38b 100644
--- a/src/rotest/core/flow_component.py
+++ b/src/rotest/core/flow_component.py
@@ -137,7 +137,9 @@ def parametrize(cls, **parameters):
         """
         new_common = cls.common.copy()
         new_common.update(**parameters)
-        return type(cls.__name__, (cls,), {'common': new_common})
+        class_name = new_common.get('name', cls.__name__)
+        return type(class_name, (cls,), {'common': new_common,
+                                         '__doc__': cls.__doc__})
 
     # Shortcut
     params = parametrize
diff --git a/tests/cli/test_discover.py b/tests/cli/test_discover.py
index d0cbb288..cf428930 100644
--- a/tests/cli/test_discover.py
+++ b/tests/cli/test_discover.py
@@ -54,7 +54,7 @@ def test_yielding_test_files():
 def test_skipping_files_by_whitelist():
     with Patcher() as patcher:
         patcher.fs.create_dir("root")
-        patcher.fs.create_file("root/some_file.py")
+        patcher.fs.create_file("root/some_file.txt")
 
         assert set(get_test_files(["root"])) == set()