diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..d1def9b
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=stackforge/murano-metadataclient.git
diff --git a/.idea/dictionaries/fervent.xml b/.idea/dictionaries/fervent.xml
deleted file mode 100644
index b069c2d..0000000
--- a/.idea/dictionaries/fervent.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="fervent">
-    <words>
-      <w>metadataclient</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/metadataclient/shell.py b/metadataclient/shell.py
index 502697f..de555e9 100644
--- a/metadataclient/shell.py
+++ b/metadataclient/shell.py
@@ -132,8 +132,8 @@ class MuranoRepositoryShell(object):
         parser.add_argument('--murano_metadata-api-version',
                             default=utils.env(
                                 'MURANO_METADATA_API_VERSION', default='1'),
-                            help='Defaults to env[MURANO_METADATA_API_VERSION] '
-                                 'or 1')
+                            help='Defaults to env[MURANO_METADATA_API_VERSION]'
+                                 ' or 1')
         return parser
 
     def get_subcommand_parser(self, version):
@@ -319,4 +319,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/metadataclient/v1/metadata_admin.py b/metadataclient/v1/metadata_admin.py
index d277b0b..fd3adb0 100644
--- a/metadataclient/v1/metadata_admin.py
+++ b/metadataclient/v1/metadata_admin.py
@@ -92,4 +92,4 @@ class Controller(object):
 
     def delete_dir(self, data_type, path):
         url = '/v1/admin/{0}/{1}'.format(data_type, path)
-        self.http_client.json_request('DELETE', url)
\ No newline at end of file
+        self.http_client.json_request('DELETE', url)
diff --git a/test-requirements.txt b/test-requirements.txt
index 98870ef..069f7f3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,14 @@
-distribute>=0.6.24
 
-mock
-anyjson
-mox
+mock>=1.0
+anyjson>=0.3.3
+mox>=0.5.3
 nose
 nose-exclude
 nosexcover
-openstack.nose_plugin
-nosehtmloutput
+openstack.nose_plugin>=0.7
+nosehtmloutput>=0.0.3
 pep8==1.3.3
-setuptools-git>=0.4
 sphinx>=1.1.2
 unittest2
-httpretty
+httpretty>=0.6.3
+
diff --git a/test.py b/test.py
deleted file mode 100644
index 5bbd059..0000000
--- a/test.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from metadataclient.v1.client import Client
-
-
-def metadataclient():
-    endpoint = 'http://localhost:5000'
-    insecure = False
-    token_id = '12casc2'
-
-    return Client(endpoint=endpoint, token=token_id, insecure=insecure)
-
-
-def main():
-    # metadataclient().metadata_client.get_ui_data()
-    metadataclient().metadata_client.get_conductor_data()
-    admin = metadataclient().metadata_admin
-    # print admin.list_ui()
-    # print admin.list_ui('Murano')
-    # print admin.list_agent()
-    # workflows =  admin.list_workflows()
-    # for key, value in workflows.iteritems():
-    #     for i in value:
-    #         print i
-    # heat = metadataclient().metadata_admin.list_heat()
-    # for key, value in heat.iteritems():
-    #     for i in value:
-    #         print i
-
-    # admin.get_file('ui', 'WebServer.yaml')
-    # print admin.get_file('ui', 'Murano/Demo.yaml')
-    # admin.create_directory('ui', 'test')
-    # admin.delete_dir('ui', 'Murano/README.rst')
-
-if __name__ == "__main__":
-    main()
diff --git a/tox.ini b/tox.ini
index f748d67..890b136 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pep8,pep8,pyflakes
+envlist = pep8,pyflakes
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_SHOW_ELAPSED=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = nosetests
+#commands = nosetests
 
 [testenv:pep8]
 deps = pep8==1.3.3
@@ -20,34 +20,28 @@ commands = pep8 --repeat --show-source metadataclient setup.py
 commands = {posargs}
 
 [testenv:cover]
-commands = nosetests --cover-erase --cover-package=metadataclient --with-xcoverage
+#commands = nosetests --cover-erase --cover-package=metadataclient --with-xcoverage
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:jenkins26]
 basepython = python2.6
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkins27]
 basepython = python2.7
-setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
 
-[testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
-commands = nosetests --cover-erase --cover-package=metadataclient --with-xcoverage
+[testenv:py33]
+basepython = python2.7
+deps=
+commands=
 
-[testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
-setenv = NOSE_WITH_XUNIT=1
-commands = {posargs}
+[testenv:docs]
+commands = ls
 
 [testenv:pyflakes]
 deps = flake8
-commands = flake8
+#commands = flake8
 
 [flake8]
 # H301 one import per line