diff --git a/Dockerfile b/Dockerfile
index bb69afe..cd6b073 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,14 +28,14 @@
 # Due to upstream bug we should use fixed version of pip
     python -m pip install --upgrade 'pip==9.0.3' \
     # initialize cvp sanity test suite
-          && pushd cvp_sanity  \
+          && pushd cvp-sanity  \
           && virtualenv  venv \
           && . venv/bin/activate \
           && pip install -r requirements.txt \
           && deactivate \
           && popd \
     # initialize cvp spt test suite
-          && pushd cvp_spt  \
+          && pushd cvp-spt  \
           && virtualenv  venv \
           && . venv/bin/activate \
           && pip install -r requirements.txt \
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index a925b49..daba3d4 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -1,31 +1,4 @@
 #!/bin/bash
 
 set -xe
-
-function _info(){
-  set +x
-  echo -e "=== INFO: pip freeze:"
-  pip freeze | sort
-  echo -e "============================"
-  set -x
-}
-
-function activate_venv(){
-  set +x
-  if [ -f venv/bin/activate ]; then
-    echo "Activating venv in $(pwd)"
-    source venv/bin/activate && echo "Activated succesfully"
-  else
-    echo "WARNING: No venv found in $(pwd)"
-    return 1
-  fi
-}
-
-echo "$@"
-if [ "$1" = "pytest" ] || [ "$1" = "python" ] || [ "$1" = "pip" ];  then
-  activate_venv &&
-  _info &&
-  exec "$@"
-else
-  exec "$@"
-fi
+exec "$@"
diff --git a/bin/with_venv.sh b/bin/with_venv.sh
new file mode 100755
index 0000000..b120ebe
--- /dev/null
+++ b/bin/with_venv.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# This file used as an interface for automatic activating of virtualenv.
+# Should be placed into PATH
+#   Example: with_venv.sh python --version
+
+set -xe
+
+function _info(){
+  set +x
+  echo -e "===== virtualenv info: ====="
+  python --version
+  pip freeze | sort
+  echo -e "============================"
+  set -x
+}
+
+function activate_venv(){
+  set +x
+  if [ -f venv/bin/activate ]; then
+    echo "Activating venv in $(pwd)"
+    source venv/bin/activate && echo "Activated succesfully"
+  else
+    echo "WARNING: No venv found in $(pwd)"
+    return 1
+  fi
+  set -x
+}
+
+activate_venv &&
+_info &&
+exec "$@"
diff --git a/test_set/cvp_sanity/README.md b/test_set/cvp-sanity/README.md
similarity index 90%
rename from test_set/cvp_sanity/README.md
rename to test_set/cvp-sanity/README.md
index 13acd7e..564f236 100644
--- a/test_set/cvp_sanity/README.md
+++ b/test_set/cvp-sanity/README.md
@@ -38,7 +38,7 @@
 
 4) Configure:
 ```bash
-   # vim cvp_checks/global_config.yaml
+   # vim cvp-sanity/global_config.yaml
 ```
 SALT credentials are mandatory for tests.
 
@@ -57,9 +57,9 @@
 
 5) Start tests:
 ```bash
-   # pytest --tb=short -sv cvp_checks/tests/
+   # pytest --tb=short -sv cvp-sanity/tests/
 ```
 or
 ```bash
-   # pytest -sv cvp_checks/tests/ --ignore cvp_checks/tests/test_mtu.py
+   # pytest -sv cvp-sanity/tests/ --ignore cvp-sanity/tests/test_mtu.py
 ```
diff --git a/test_set/cvp_sanity/__init__.py b/test_set/cvp-sanity/__init__.py
similarity index 100%
rename from test_set/cvp_sanity/__init__.py
rename to test_set/cvp-sanity/__init__.py
diff --git a/test_set/cvp-sanity/conftest.py b/test_set/cvp-sanity/conftest.py
new file mode 100644
index 0000000..693d514
--- /dev/null
+++ b/test_set/cvp-sanity/conftest.py
@@ -0,0 +1 @@
+from fixtures.base import *
diff --git a/test_set/cvp_sanity/fixtures/__init__.py b/test_set/cvp-sanity/fixtures/__init__.py
similarity index 100%
rename from test_set/cvp_sanity/fixtures/__init__.py
rename to test_set/cvp-sanity/fixtures/__init__.py
diff --git a/test_set/cvp_sanity/fixtures/base.py b/test_set/cvp-sanity/fixtures/base.py
similarity index 98%
rename from test_set/cvp_sanity/fixtures/base.py
rename to test_set/cvp-sanity/fixtures/base.py
index f6ad22a..dccee56 100644
--- a/test_set/cvp_sanity/fixtures/base.py
+++ b/test_set/cvp-sanity/fixtures/base.py
@@ -1,6 +1,6 @@
 import pytest
 import atexit
-import cvp_checks.utils as utils
+import utils
 
 
 @pytest.fixture(scope='session')
diff --git a/test_set/cvp_sanity/global_config.yaml b/test_set/cvp-sanity/global_config.yaml
similarity index 100%
rename from test_set/cvp_sanity/global_config.yaml
rename to test_set/cvp-sanity/global_config.yaml
diff --git a/test_set/cvp-sanity/pytest.ini b/test_set/cvp-sanity/pytest.ini
new file mode 100644
index 0000000..32f15a2
--- /dev/null
+++ b/test_set/cvp-sanity/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = venv
\ No newline at end of file
diff --git a/test_set/cvp_sanity/requirements.txt b/test_set/cvp-sanity/requirements.txt
similarity index 100%
rename from test_set/cvp_sanity/requirements.txt
rename to test_set/cvp-sanity/requirements.txt
diff --git a/test_set/cvp_sanity/tests/__init__.py b/test_set/cvp-sanity/tests/__init__.py
similarity index 100%
rename from test_set/cvp_sanity/tests/__init__.py
rename to test_set/cvp-sanity/tests/__init__.py
diff --git a/test_set/cvp_sanity/tests/ceph/test_ceph_haproxy.py b/test_set/cvp-sanity/tests/ceph/test_ceph_haproxy.py
similarity index 100%
rename from test_set/cvp_sanity/tests/ceph/test_ceph_haproxy.py
rename to test_set/cvp-sanity/tests/ceph/test_ceph_haproxy.py
diff --git a/test_set/cvp_sanity/tests/ceph/test_ceph_pg_count.py b/test_set/cvp-sanity/tests/ceph/test_ceph_pg_count.py
similarity index 100%
rename from test_set/cvp_sanity/tests/ceph/test_ceph_pg_count.py
rename to test_set/cvp-sanity/tests/ceph/test_ceph_pg_count.py
diff --git a/test_set/cvp_sanity/tests/ceph/test_ceph_replicas.py b/test_set/cvp-sanity/tests/ceph/test_ceph_replicas.py
similarity index 100%
rename from test_set/cvp_sanity/tests/ceph/test_ceph_replicas.py
rename to test_set/cvp-sanity/tests/ceph/test_ceph_replicas.py
diff --git a/test_set/cvp_sanity/tests/ceph/test_ceph_status.py b/test_set/cvp-sanity/tests/ceph/test_ceph_status.py
similarity index 100%
rename from test_set/cvp_sanity/tests/ceph/test_ceph_status.py
rename to test_set/cvp-sanity/tests/ceph/test_ceph_status.py
diff --git a/test_set/cvp_sanity/tests/ceph/test_ceph_tell_bench.py b/test_set/cvp-sanity/tests/ceph/test_ceph_tell_bench.py
similarity index 100%
rename from test_set/cvp_sanity/tests/ceph/test_ceph_tell_bench.py
rename to test_set/cvp-sanity/tests/ceph/test_ceph_tell_bench.py
diff --git a/test_set/cvp_sanity/tests/test_cinder_services.py b/test_set/cvp-sanity/tests/test_cinder_services.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_cinder_services.py
rename to test_set/cvp-sanity/tests/test_cinder_services.py
diff --git a/test_set/cvp_sanity/tests/test_contrail.py b/test_set/cvp-sanity/tests/test_contrail.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_contrail.py
rename to test_set/cvp-sanity/tests/test_contrail.py
diff --git a/test_set/cvp_sanity/tests/test_default_gateway.py b/test_set/cvp-sanity/tests/test_default_gateway.py
similarity index 95%
rename from test_set/cvp_sanity/tests/test_default_gateway.py
rename to test_set/cvp-sanity/tests/test_default_gateway.py
index 69fd116..36ca70e 100644
--- a/test_set/cvp_sanity/tests/test_default_gateway.py
+++ b/test_set/cvp-sanity/tests/test_default_gateway.py
@@ -1,7 +1,7 @@
 import json
 import pytest
 import os
-from cvp_checks import utils
+import utils
 
 
 def test_check_default_gateways(local_salt_client, nodes_in_group):
diff --git a/test_set/cvp_sanity/tests/test_drivetrain.py b/test_set/cvp-sanity/tests/test_drivetrain.py
similarity index 99%
rename from test_set/cvp_sanity/tests/test_drivetrain.py
rename to test_set/cvp-sanity/tests/test_drivetrain.py
index 468cdea..4628e70 100644
--- a/test_set/cvp_sanity/tests/test_drivetrain.py
+++ b/test_set/cvp-sanity/tests/test_drivetrain.py
@@ -1,6 +1,6 @@
 import jenkins
 from xml.dom import minidom
-from cvp_checks import utils
+import utils
 import json
 import pytest
 import time
diff --git a/test_set/cvp_sanity/tests/test_etc_hosts.py b/test_set/cvp-sanity/tests/test_etc_hosts.py
similarity index 95%
rename from test_set/cvp_sanity/tests/test_etc_hosts.py
rename to test_set/cvp-sanity/tests/test_etc_hosts.py
index 1db29c8..cd9fc35 100644
--- a/test_set/cvp_sanity/tests/test_etc_hosts.py
+++ b/test_set/cvp-sanity/tests/test_etc_hosts.py
@@ -1,7 +1,7 @@
 import pytest
 import json
 import os
-from cvp_checks import utils
+import utils
 
 
 def test_etc_hosts(local_salt_client):
diff --git a/test_set/cvp_sanity/tests/test_galera_cluster.py b/test_set/cvp-sanity/tests/test_galera_cluster.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_galera_cluster.py
rename to test_set/cvp-sanity/tests/test_galera_cluster.py
diff --git a/test_set/cvp_sanity/tests/test_k8s.py b/test_set/cvp-sanity/tests/test_k8s.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_k8s.py
rename to test_set/cvp-sanity/tests/test_k8s.py
diff --git a/test_set/cvp_sanity/tests/test_mtu.py b/test_set/cvp-sanity/tests/test_mtu.py
similarity index 98%
rename from test_set/cvp_sanity/tests/test_mtu.py
rename to test_set/cvp-sanity/tests/test_mtu.py
index 9054ba3..9930fea 100644
--- a/test_set/cvp_sanity/tests/test_mtu.py
+++ b/test_set/cvp-sanity/tests/test_mtu.py
@@ -1,6 +1,6 @@
 import pytest
 import json
-from cvp_checks import utils
+import utils
 import os
 
 
diff --git a/test_set/cvp_sanity/tests/test_nova_services.py b/test_set/cvp-sanity/tests/test_nova_services.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_nova_services.py
rename to test_set/cvp-sanity/tests/test_nova_services.py
diff --git a/test_set/cvp_sanity/tests/test_ntp_sync.py b/test_set/cvp-sanity/tests/test_ntp_sync.py
similarity index 96%
rename from test_set/cvp_sanity/tests/test_ntp_sync.py
rename to test_set/cvp-sanity/tests/test_ntp_sync.py
index 09b323f..6e35215 100644
--- a/test_set/cvp_sanity/tests/test_ntp_sync.py
+++ b/test_set/cvp-sanity/tests/test_ntp_sync.py
@@ -1,4 +1,4 @@
-from cvp_checks import utils
+import utils
 import os
 
 
diff --git a/test_set/cvp_sanity/tests/test_oss.py b/test_set/cvp-sanity/tests/test_oss.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_oss.py
rename to test_set/cvp-sanity/tests/test_oss.py
diff --git a/test_set/cvp_sanity/tests/test_packet_checker.py b/test_set/cvp-sanity/tests/test_packet_checker.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_packet_checker.py
rename to test_set/cvp-sanity/tests/test_packet_checker.py
diff --git a/test_set/cvp_sanity/tests/test_rabbit_cluster.py b/test_set/cvp-sanity/tests/test_rabbit_cluster.py
similarity index 98%
rename from test_set/cvp_sanity/tests/test_rabbit_cluster.py
rename to test_set/cvp-sanity/tests/test_rabbit_cluster.py
index daae7ce..f3f03e1 100644
--- a/test_set/cvp_sanity/tests/test_rabbit_cluster.py
+++ b/test_set/cvp-sanity/tests/test_rabbit_cluster.py
@@ -1,4 +1,4 @@
-from cvp_checks import utils
+import utils
 
 
 def test_checking_rabbitmq_cluster(local_salt_client):
diff --git a/test_set/cvp_sanity/tests/test_repo_list.py b/test_set/cvp-sanity/tests/test_repo_list.py
similarity index 98%
rename from test_set/cvp_sanity/tests/test_repo_list.py
rename to test_set/cvp-sanity/tests/test_repo_list.py
index 0e35f37..da99ee8 100644
--- a/test_set/cvp_sanity/tests/test_repo_list.py
+++ b/test_set/cvp-sanity/tests/test_repo_list.py
@@ -1,5 +1,5 @@
 import pytest
-from cvp_checks import utils
+import utils
 
 
 def test_list_of_repo_on_nodes(local_salt_client, nodes_in_group):
diff --git a/test_set/cvp_sanity/tests/test_salt_master.py b/test_set/cvp-sanity/tests/test_salt_master.py
similarity index 100%
rename from test_set/cvp_sanity/tests/test_salt_master.py
rename to test_set/cvp-sanity/tests/test_salt_master.py
diff --git a/test_set/cvp_sanity/tests/test_services.py b/test_set/cvp-sanity/tests/test_services.py
similarity index 97%
rename from test_set/cvp_sanity/tests/test_services.py
rename to test_set/cvp-sanity/tests/test_services.py
index 89794c1..02c001b 100644
--- a/test_set/cvp_sanity/tests/test_services.py
+++ b/test_set/cvp-sanity/tests/test_services.py
@@ -1,13 +1,13 @@
 import pytest
 import json
 import os
-from cvp_checks import utils
+import utils
 
 # Some nodes can have services that are not applicable for other noder in similar group.
 # For example , there are 3 node in kvm group, but just kvm03 node has srv-volumes-backup.mount service
 # in service.get_all
 #                        NODE NAME          SERVICE_NAME
-inconsistency_rule = {"kvm03": ["srv-volumes-backup.mount"]}
+inconsistency_rule = {"kvm03": ["srv-volumes-backup.mount", "rsync"]}
 
 
 def test_check_services(local_salt_client, nodes_in_group):
diff --git a/test_set/cvp_sanity/tests/test_single_vip.py b/test_set/cvp-sanity/tests/test_single_vip.py
similarity index 95%
rename from test_set/cvp_sanity/tests/test_single_vip.py
rename to test_set/cvp-sanity/tests/test_single_vip.py
index fe6cb5f..29bdb88 100644
--- a/test_set/cvp_sanity/tests/test_single_vip.py
+++ b/test_set/cvp-sanity/tests/test_single_vip.py
@@ -1,5 +1,5 @@
 import pytest
-from cvp_checks import utils
+import utils
 import os
 from collections import Counter
 
diff --git a/test_set/cvp_sanity/tests/test_stacklight.py b/test_set/cvp-sanity/tests/test_stacklight.py
similarity index 99%
rename from test_set/cvp_sanity/tests/test_stacklight.py
rename to test_set/cvp-sanity/tests/test_stacklight.py
index ec6ed40..491c1ee 100644
--- a/test_set/cvp_sanity/tests/test_stacklight.py
+++ b/test_set/cvp-sanity/tests/test_stacklight.py
@@ -2,7 +2,7 @@
 import requests
 import datetime
 import pytest
-from cvp_checks import utils
+import utils
 
 
 @pytest.mark.usefixtures('check_kibana')
diff --git a/test_set/cvp_sanity/tests/test_ui_addresses.py b/test_set/cvp-sanity/tests/test_ui_addresses.py
similarity index 98%
rename from test_set/cvp_sanity/tests/test_ui_addresses.py
rename to test_set/cvp-sanity/tests/test_ui_addresses.py
index 82bcae1..3f6f3a3 100644
--- a/test_set/cvp_sanity/tests/test_ui_addresses.py
+++ b/test_set/cvp-sanity/tests/test_ui_addresses.py
@@ -1,4 +1,4 @@
-from cvp_checks import utils
+import utils
 import pytest
 
 
diff --git a/test_set/cvp_sanity/utils/__init__.py b/test_set/cvp-sanity/utils/__init__.py
similarity index 100%
rename from test_set/cvp_sanity/utils/__init__.py
rename to test_set/cvp-sanity/utils/__init__.py
diff --git a/test_set/cvp_spt/README.md b/test_set/cvp-spt/README.md
similarity index 100%
rename from test_set/cvp_spt/README.md
rename to test_set/cvp-spt/README.md
diff --git a/test_set/cvp_spt/__init__.py b/test_set/cvp-spt/__init__.py
similarity index 100%
rename from test_set/cvp_spt/__init__.py
rename to test_set/cvp-spt/__init__.py
diff --git a/test_set/cvp-spt/conftest.py b/test_set/cvp-spt/conftest.py
new file mode 100644
index 0000000..693d514
--- /dev/null
+++ b/test_set/cvp-spt/conftest.py
@@ -0,0 +1 @@
+from fixtures.base import *
diff --git a/test_set/cvp_spt/fixtures/__init__.py b/test_set/cvp-spt/fixtures/__init__.py
similarity index 100%
rename from test_set/cvp_spt/fixtures/__init__.py
rename to test_set/cvp-spt/fixtures/__init__.py
diff --git a/test_set/cvp_spt/fixtures/base.py b/test_set/cvp-spt/fixtures/base.py
similarity index 98%
rename from test_set/cvp_spt/fixtures/base.py
rename to test_set/cvp-spt/fixtures/base.py
index b4c07ac..5c4b72d 100644
--- a/test_set/cvp_spt/fixtures/base.py
+++ b/test_set/cvp-spt/fixtures/base.py
@@ -1,8 +1,8 @@
 import pytest
-import cvp_spt.utils as utils
+import utils
 import random
 import time
-from cvp_spt.utils import os_client
+from utils import os_client
 
 @pytest.fixture(scope='session')
 def local_salt_client():
diff --git a/test_set/cvp_spt/global_config.yaml b/test_set/cvp-spt/global_config.yaml
similarity index 100%
rename from test_set/cvp_spt/global_config.yaml
rename to test_set/cvp-spt/global_config.yaml
diff --git a/test_set/cvp-spt/pytest.ini b/test_set/cvp-spt/pytest.ini
new file mode 100644
index 0000000..32f15a2
--- /dev/null
+++ b/test_set/cvp-spt/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs = venv
\ No newline at end of file
diff --git a/test_set/cvp_spt/requirements.txt b/test_set/cvp-spt/requirements.txt
similarity index 100%
rename from test_set/cvp_spt/requirements.txt
rename to test_set/cvp-spt/requirements.txt
diff --git a/test_set/cvp_spt/tests/__init__.py b/test_set/cvp-spt/tests/__init__.py
similarity index 100%
rename from test_set/cvp_spt/tests/__init__.py
rename to test_set/cvp-spt/tests/__init__.py
diff --git a/test_set/cvp_spt/tests/test_glance.py b/test_set/cvp-spt/tests/test_glance.py
similarity index 97%
rename from test_set/cvp_spt/tests/test_glance.py
rename to test_set/cvp-spt/tests/test_glance.py
index fd6681f..ab4fe64 100644
--- a/test_set/cvp_spt/tests/test_glance.py
+++ b/test_set/cvp-spt/tests/test_glance.py
@@ -1,7 +1,7 @@
 import pytest
 import time
 import subprocess
-import cvp_spt.utils as utils
+import  utils
 
 
 @pytest.fixture
diff --git a/test_set/cvp_spt/tests/test_hw2hw.py b/test_set/cvp-spt/tests/test_hw2hw.py
similarity index 97%
rename from test_set/cvp_spt/tests/test_hw2hw.py
rename to test_set/cvp-spt/tests/test_hw2hw.py
index 629be42..625fed8 100644
--- a/test_set/cvp_spt/tests/test_hw2hw.py
+++ b/test_set/cvp-spt/tests/test_hw2hw.py
@@ -4,8 +4,8 @@
 import os
 import yaml
 import requests
-from cvp_spt import utils
-from cvp_spt.utils import helpers
+import utils
+from utils import helpers
 from netaddr import IPNetwork, IPAddress
 
 
diff --git a/test_set/cvp_spt/tests/test_vm2vm.py b/test_set/cvp-spt/tests/test_vm2vm.py
similarity index 98%
rename from test_set/cvp_spt/tests/test_vm2vm.py
rename to test_set/cvp-spt/tests/test_vm2vm.py
index 9e1d5d7..7b3851b 100644
--- a/test_set/cvp_spt/tests/test_vm2vm.py
+++ b/test_set/cvp-spt/tests/test_vm2vm.py
@@ -2,9 +2,9 @@
 import random
 import time
 import pytest
-from cvp_spt import utils
-from cvp_spt.utils import os_client
-from cvp_spt.utils import ssh
+import utils
+from utils import os_client
+from utils import ssh
 
 
 def test_vm2vm (openstack_clients, pair, os_resources, record_property):
diff --git a/test_set/cvp_spt/utils/__init__.py b/test_set/cvp-spt/utils/__init__.py
similarity index 98%
rename from test_set/cvp_spt/utils/__init__.py
rename to test_set/cvp-spt/utils/__init__.py
index c53dd69..36cf239 100644
--- a/test_set/cvp_spt/utils/__init__.py
+++ b/test_set/cvp-spt/utils/__init__.py
@@ -5,7 +5,7 @@
 import sys, traceback
 import itertools
 import helpers
-from cvp_spt.utils import os_client
+from utils import os_client
 
 
 class salt_remote:
diff --git a/test_set/cvp_spt/utils/helpers.py b/test_set/cvp-spt/utils/helpers.py
similarity index 100%
rename from test_set/cvp_spt/utils/helpers.py
rename to test_set/cvp-spt/utils/helpers.py
diff --git a/test_set/cvp_spt/utils/os_client.py b/test_set/cvp-spt/utils/os_client.py
similarity index 100%
rename from test_set/cvp_spt/utils/os_client.py
rename to test_set/cvp-spt/utils/os_client.py
diff --git a/test_set/cvp_spt/utils/ssh.py b/test_set/cvp-spt/utils/ssh.py
similarity index 99%
rename from test_set/cvp_spt/utils/ssh.py
rename to test_set/cvp-spt/utils/ssh.py
index 8e78963..66551eb 100644
--- a/test_set/cvp_spt/utils/ssh.py
+++ b/test_set/cvp-spt/utils/ssh.py
@@ -1,7 +1,7 @@
 import cStringIO
 import logging
 import select
-from cvp_spt import utils
+import utils
 import paramiko
 
 
diff --git a/test_set/cvp_sanity/tests/conftest.py b/test_set/cvp_sanity/tests/conftest.py
deleted file mode 100644
index 21af490..0000000
--- a/test_set/cvp_sanity/tests/conftest.py
+++ /dev/null
@@ -1 +0,0 @@
-from cvp_checks.fixtures.base import *
diff --git a/test_set/cvp_spt/tests/conftest.py b/test_set/cvp_spt/tests/conftest.py
deleted file mode 100644
index a0636ac..0000000
--- a/test_set/cvp_spt/tests/conftest.py
+++ /dev/null
@@ -1 +0,0 @@
-from cvp_spt.fixtures.base import *