diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 00000000..a0bfaddd
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,564 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-whitelist=
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=print-statement,
+        parameter-unpacking,
+        unpacking-in-except,
+        old-raise-syntax,
+        backtick,
+        long-suffix,
+        old-ne-operator,
+        old-octal-literal,
+        import-star-module-level,
+        non-ascii-bytes-literal,
+        raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead,
+        apply-builtin,
+        basestring-builtin,
+        buffer-builtin,
+        cmp-builtin,
+        coerce-builtin,
+        execfile-builtin,
+        file-builtin,
+        long-builtin,
+        raw_input-builtin,
+        reduce-builtin,
+        standarderror-builtin,
+        unicode-builtin,
+        xrange-builtin,
+        coerce-method,
+        delslice-method,
+        getslice-method,
+        setslice-method,
+        no-absolute-import,
+        old-division,
+        dict-iter-method,
+        dict-view-method,
+        next-method-called,
+        metaclass-assignment,
+        indexing-exception,
+        raising-string,
+        reload-builtin,
+        oct-method,
+        hex-method,
+        nonzero-method,
+        cmp-method,
+        input-builtin,
+        round-builtin,
+        intern-builtin,
+        unichr-builtin,
+        map-builtin-not-iterating,
+        zip-builtin-not-iterating,
+        range-builtin-not-iterating,
+        filter-builtin-not-iterating,
+        using-cmp-argument,
+        eq-without-hash,
+        div-method,
+        idiv-method,
+        rdiv-method,
+        exception-message-attribute,
+        invalid-str-codec,
+        sys-max-int,
+        bad-python3-import,
+        deprecated-string-function,
+        deprecated-str-translate-call,
+        deprecated-itertools-function,
+        deprecated-types-field,
+        next-method-defined,
+        dict-items-not-iterating,
+        dict-keys-not-iterating,
+        dict-values-not-iterating,
+        deprecated-operator-function,
+        deprecated-urllib-function,
+        xreadlines-attribute,
+        deprecated-sys-function,
+        exception-escape,
+        comprehension-escape,
+        too-few-public-methods,
+        useless-object-inheritance
+
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx=
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=120
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,
+               dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[LOGGING]
+
+# Format style used to check logging format string. `old` means using %
+# formatting, while `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package..
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+                  _fields,
+                  _replace,
+                  _source,
+                  _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement.
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled).
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled).
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception".
+overgeneral-exceptions=Exception
diff --git a/README.md b/README.md
index c0bdc62e..cafdffde 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,12 @@ Once you are ready with our changes, please run flake8:
 python -m flake8 --max-line-length=120 core core_tests data products tests
 ```
 
+Notes:
+We plan to adopt `pylint`, but we are still in process of defining rules and fixing lint errors.
+```bash
+python -m pylint core data product --rcfile=c:\Git\nativescript-tooling-qa\.pylintrc
+```
+
 ## Hints, Tips and Tricks
 
 Please see [Hints, Tips and Tricks](HINTS.md) document.
diff --git a/products/angular/ng.py b/products/angular/ng.py
index efc70fe3..931ddab7 100644
--- a/products/angular/ng.py
+++ b/products/angular/ng.py
@@ -106,7 +106,7 @@ def serve(project=Settings.AppName.DEFAULT, prod=False):
         if prod:
             command = command + ' --prod'
         result = NG.exec_command(command=command, cwd=project_path, wait=False)
-        compiled = Wait.until(lambda: 'Compiled successfully' in File.read(result.log_file), timeout=90)
+        compiled = Wait.until(lambda: 'Compiled successfully' in File.read(result.log_file), timeout=180)
         if not compiled:
             Log.error('NG Serve failed to compile in 90 sec.')
             Log.error('Logs:{0}{1}'.format(os.linesep, File.read(result.log_file)))
diff --git a/requirements.txt b/requirements.txt
index 547f5ca9..4bdc3d57 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,6 @@ numpy>=1.15.4
 opencv-python>=3.4.3.18
 pytesseract>=0.2.5
 flake8>=3.6.0
+pylint>=2.2.2
 selenium>=3.141.0
 webdriver_manager>=1.7
\ No newline at end of file
diff --git a/requirements_darwin.txt b/requirements_darwin.txt
index e736fac2..6719d948 100644
--- a/requirements_darwin.txt
+++ b/requirements_darwin.txt
@@ -10,6 +10,7 @@ numpy>=1.15.4
 opencv-python>=3.4.3.18
 pytesseract>=0.2.5
 flake8>=3.6.0
+pylint>=2.2.2
 selenium>=3.141.0
 webdriver_manager>=1.7
 atomac>=1.1.0
diff --git a/run_common.py b/run_common.py
index 27ba9e74..cb5b479e 100644
--- a/run_common.py
+++ b/run_common.py
@@ -56,19 +56,11 @@ def __get_templates():
             raise IOError("Failed to clone and pack template: " + template_name)
 
 
-def __get_packages():
+def __get_runtimes():
     """
-    Get NativeScript CLI and runtimes in TEST_SUT_HOME.
+    Get {N} Runtimes in TEST_SUT_HOME.
     """
 
-    # Copy or install NativeScript CLI
-    if '.tgz' in Settings.Packages.NS_CLI:
-        cli_package = os.path.join(Settings.TEST_SUT_HOME, 'nativescript.tgz')
-        File.copy(src=Settings.Packages.NS_CLI, target=cli_package)
-        Settings.Packages.NS_CLI = cli_package
-    else:
-        Npm.install(package=Settings.Packages.NS_CLI, folder=Settings.TEST_RUN_HOME)
-
     # Copy or download tns-android
     android_package = os.path.join(Settings.TEST_SUT_HOME, 'tns-android.tgz')
     if '.tgz' in Settings.Packages.ANDROID:
@@ -92,6 +84,13 @@ def __install_ns_cli():
     Install NativeScript CLI locally.
     """
 
+    # Copy NativeScript CLI (if used from local package)
+    if '.tgz' in Settings.Packages.NS_CLI:
+        cli_package = os.path.join(Settings.TEST_SUT_HOME, 'nativescript.tgz')
+        File.copy(src=Settings.Packages.NS_CLI, target=cli_package)
+        Settings.Packages.NS_CLI = cli_package
+
+    # Install NativeScript CLI
     output = Npm.install(package=Settings.Packages.NS_CLI, folder=Settings.TEST_RUN_HOME)
 
     # Verify executable exists after install
@@ -136,8 +135,8 @@ def __install_schematics():
 def prepare(clone_templates=True, install_ng_cli=False):
     Log.info('================== Prepare Test Run ==================')
     __cleanup()
-    __get_packages()
     __install_ns_cli()
+    __get_runtimes()
     if install_ng_cli:
         __install_ng_cli()
         __install_schematics()
diff --git a/tests/cli/build/build.md b/tests/cli/build/build.md
new file mode 100644
index 00000000..ee978993
--- /dev/null
+++ b/tests/cli/build/build.md
@@ -0,0 +1,9 @@
+#Tests to be writen
+
+**platform add/remove/list/update**
+
+**prepare**
+
+**build**
+
+**install**
\ No newline at end of file
diff --git a/tests/cli/create/create.md b/tests/cli/create/create.md
new file mode 100644
index 00000000..b9283556
--- /dev/null
+++ b/tests/cli/create/create.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**create and init**
+https://github.com/NativeScript/nativescript-cli/tree/master/docs/man_pages/project/creation
diff --git a/tests/cli/debug/debug.md b/tests/cli/debug/debug.md
new file mode 100644
index 00000000..61b6412c
--- /dev/null
+++ b/tests/cli/debug/debug.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**debug**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/project/testing/debug.md
diff --git a/tests/cli/build/common/doctor_tests.py b/tests/cli/misc/doctor_tests.py
similarity index 98%
rename from tests/cli/build/common/doctor_tests.py
rename to tests/cli/misc/doctor_tests.py
index 512c99cf..2f5a0630 100644
--- a/tests/cli/build/common/doctor_tests.py
+++ b/tests/cli/misc/doctor_tests.py
@@ -9,7 +9,7 @@
 
 
 # noinspection PyMethodMayBeStatic
-class DoctorFunctionalTests(TnsTest):
+class DoctorTests(TnsTest):
     APP_NAME = Settings.AppName.DEFAULT
     ANDROID_HOME = os.environ.get('ANDROID_HOME')
     JAVA_HOME = os.environ.get('JAVA_HOME')
diff --git a/tests/cli/misc/misc.md b/tests/cli/misc/misc.md
new file mode 100644
index 00000000..fdf473d6
--- /dev/null
+++ b/tests/cli/misc/misc.md
@@ -0,0 +1,18 @@
+#Tests to be writen
+
+**autocomplete**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/general/autocomplete.md
+
+**setup**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/env-configuration/setup.md
+
+**usage and error reporting**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/general/error-reporting.md
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/general/usage-reporting.md
+
+**tns appstore and publish**
+
+**tns help**
+
+**tns proxy**
+
diff --git a/tests/cli/misc/pacakge_manager_tests.py b/tests/cli/misc/pacakge_manager_tests.py
new file mode 100644
index 00000000..8c0b0674
--- /dev/null
+++ b/tests/cli/misc/pacakge_manager_tests.py
@@ -0,0 +1,31 @@
+from core.base_test.tns_test import TnsTest
+from products.nativescript.tns import Tns
+
+
+# noinspection PyMethodMayBeStatic
+class PackageManagerTests(TnsTest):
+
+    @classmethod
+    def setUpClass(cls):
+        TnsTest.setUpClass()
+
+    def setUp(self):
+        TnsTest.setUp(self)
+
+    def tearDown(self):
+        TnsTest.tearDown(self)
+
+    @classmethod
+    def tearDownClass(cls):
+        TnsTest.tearDownClass()
+
+    def test_001_package_manager_get(self):
+        result = Tns.exec_command(command='package-manager get')
+        assert result.exit_code == 0, 'tns package-manager get exit with non zero exit code.'
+        assert 'npm' in result.output, 'Default package manager is not npm.'
+
+    def test_400_package_manager_set_wrong_value(self):
+        result = Tns.exec_command(command='package-manager set fake')
+        assert result.exit_code != 0, 'tns package-manager should exit with non zero exit code on fails.'
+        assert 'fake is not a valid package manager.' in result.output, 'Wrong package manager not detected.'
+        assert 'Only yarn or npm are supported.' in result.output, 'No message for supported managers.'
diff --git a/tests/cli/plugin/plugin.md b/tests/cli/plugin/plugin.md
new file mode 100644
index 00000000..698c845d
--- /dev/null
+++ b/tests/cli/plugin/plugin.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**plugin**
+https://github.com/NativeScript/nativescript-cli/tree/master/docs/man_pages/lib-management
\ No newline at end of file
diff --git a/tests/cli/preview/preview.md b/tests/cli/preview/preview.md
new file mode 100644
index 00000000..ca10a9d0
--- /dev/null
+++ b/tests/cli/preview/preview.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**preview**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/project/testing/preview.md
diff --git a/tests/cli/resources/resources.md b/tests/cli/resources/resources.md
new file mode 100644
index 00000000..47a5308b
--- /dev/null
+++ b/tests/cli/resources/resources.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**resources**
+https://github.com/NativeScript/nativescript-cli/tree/master/docs/man_pages/project/configuration/resources
\ No newline at end of file
diff --git a/tests/cli/run/run.md b/tests/cli/run/run.md
new file mode 100644
index 00000000..65711228
--- /dev/null
+++ b/tests/cli/run/run.md
@@ -0,0 +1,8 @@
+# Tests to be writen
+
+**device**
+https://github.com/NativeScript/nativescript-cli/tree/master/docs/man_pages/device
+
+**deploy**
+
+**run**
\ No newline at end of file
diff --git a/tests/cli/run/templates/hello_world_ng_tests.py b/tests/cli/run/templates/hello_world_ng_tests.py
index a6159da1..9f784edf 100644
--- a/tests/cli/run/templates/hello_world_ng_tests.py
+++ b/tests/cli/run/templates/hello_world_ng_tests.py
@@ -64,7 +64,6 @@ def test_200_run_android_bundle(self):
     def test_300_run_android_bundle_aot(self):
         sync_hello_world_ng(self.app_name, Platform.ANDROID, self.emu, bundle=True, aot=True)
 
-    @unittest.skip('Ignore because of https://github.com/NativeScript/nativescript-angular/issues/1572')
     def test_310_run_android_bundle_uglify(self):
         sync_hello_world_ng(self.app_name, Platform.ANDROID, self.emu, bundle=True, uglify=True)
 
@@ -83,7 +82,6 @@ def test_200_run_ios_bundle(self):
     def test_300_run_ios_bundle_aot(self):
         sync_hello_world_ng(self.app_name, Platform.IOS, self.sim, bundle=True, aot=True)
 
-    @unittest.skip('Ignore because of https://github.com/NativeScript/nativescript-angular/issues/1572')
     def test_310_run_ios_bundle_uglify(self):
         sync_hello_world_ng(self.app_name, Platform.IOS, self.sim, bundle=True, uglify=True)
 
diff --git a/tests/cli/run/templates/master_detail_ng_tests.py b/tests/cli/run/templates/master_detail_ng_tests.py
index f91b85e5..119689ac 100644
--- a/tests/cli/run/templates/master_detail_ng_tests.py
+++ b/tests/cli/run/templates/master_detail_ng_tests.py
@@ -64,7 +64,6 @@ def test_200_run_android_bundle(self):
     def test_300_run_android_bundle_aot(self):
         sync_master_detail_ng(self.app_name, Platform.ANDROID, self.emu, bundle=True, aot=True)
 
-    @unittest.skip('Ignore because of https://github.com/NativeScript/nativescript-angular/issues/1572')
     def test_310_run_android_bundle_uglify(self):
         sync_master_detail_ng(self.app_name, Platform.ANDROID, self.emu, bundle=True, uglify=True)
 
@@ -83,7 +82,6 @@ def test_200_run_ios_bundle(self):
     def test_300_run_ios_bundle_aot(self):
         sync_master_detail_ng(self.app_name, Platform.IOS, self.sim, bundle=True, aot=True)
 
-    @unittest.skip('Ignore because of https://github.com/NativeScript/nativescript-angular/issues/1572')
     def test_310_run_ios_bundle_uglify(self):
         sync_master_detail_ng(self.app_name, Platform.IOS, self.sim, bundle=True, uglify=True)
 
diff --git a/tests/cli/smoke/smoke_tests.py b/tests/cli/smoke/smoke_tests.py
index 7ca1e361..7420fcc1 100644
--- a/tests/cli/smoke/smoke_tests.py
+++ b/tests/cli/smoke/smoke_tests.py
@@ -5,7 +5,6 @@
 from core.enums.os_type import OSType
 from core.enums.platform_type import Platform
 from core.settings import Settings
-from core.utils.ci.jenkins import Jenkins
 from core.utils.device.device_manager import DeviceManager
 from data.sync.hello_world_js import sync_hello_world_js
 from data.sync.hello_world_ng import sync_hello_world_ng
@@ -13,7 +12,7 @@
 from products.nativescript.tns import Tns
 
 
-class CLISmokeTests(TnsTest):
+class SmokeTests(TnsTest):
     js_app = Settings.AppName.DEFAULT + 'JS'
     js_source_project_dir = os.path.join(Settings.TEST_RUN_HOME, js_app)
     js_target_project_dir = os.path.join(Settings.TEST_RUN_HOME, 'data', 'temp', js_app)
@@ -25,8 +24,6 @@ class CLISmokeTests(TnsTest):
     emu = None
     sim = None
 
-    is_pr = Jenkins.is_pr()
-
     @classmethod
     def setUpClass(cls):
         TnsTest.setUpClass()
@@ -37,13 +34,13 @@ def setUpClass(cls):
             cls.sim = DeviceManager.Simulator.ensure_available(Settings.Simulators.DEFAULT)
 
         # Create JS app and copy to temp data folder
-        Tns.create(app_name=cls.js_app, template=Template.HELLO_WORLD_JS.local_package, update=cls.is_pr)
+        Tns.create(app_name=cls.js_app, template=Template.HELLO_WORLD_JS.local_package, update=False)
         Tns.platform_add_android(app_name=cls.js_app, framework_path=Settings.Android.FRAMEWORK_PATH)
         if Settings.HOST_OS is OSType.OSX:
             Tns.platform_add_ios(app_name=cls.js_app, framework_path=Settings.IOS.FRAMEWORK_PATH)
 
         # Create NG app and copy to temp data folder
-        Tns.create(app_name=cls.ng_app, template=Template.HELLO_WORLD_NG.local_package, update=cls.is_pr)
+        Tns.create(app_name=cls.ng_app, template=Template.HELLO_WORLD_NG.local_package, update=False)
         Tns.platform_add_android(app_name=cls.ng_app, framework_path=Settings.Android.FRAMEWORK_PATH)
         if Settings.HOST_OS is OSType.OSX:
             Tns.platform_add_ios(app_name=cls.ng_app, framework_path=Settings.IOS.FRAMEWORK_PATH)
@@ -68,12 +65,3 @@ def test_100_run_android_ng(self):
     @unittest.skipIf(Settings.HOST_OS is not OSType.OSX, 'iOS tests can be executed only on macOS.')
     def test_101_run_ios_ng(self):
         sync_hello_world_ng(app_name=self.ng_app, platform=Platform.IOS, device=self.sim, bundle=True)
-
-    @unittest.skipIf(is_pr, 'Skip on PR jobs.')
-    def test_200_build_android_release(self):
-        Tns.build_android(app_name=self.js_app, release=True, bundle=True, aot=True, uglify=True, snapshot=True)
-
-    @unittest.skipIf(is_pr, 'Skip on PR jobs.')
-    @unittest.skipIf(Settings.HOST_OS is not OSType.OSX, 'iOS tests can be executed only on macOS.')
-    def test_200_build_ios_release(self):
-        Tns.build_ios(app_name=self.js_app, for_device=True, release=True, bundle=True, aot=True, uglify=True)
diff --git a/tests/cli/test-description.md b/tests/cli/test-description.md
new file mode 100644
index 00000000..1008087c
--- /dev/null
+++ b/tests/cli/test-description.md
@@ -0,0 +1,62 @@
+# NativeScript CLI Tests Folder Structure
+
+### Smoke tests
+
+`smoke` folder contains set smoke tests that are executed on PRs.
+
+On commit in master we run:
+```bash
+python run_ns.py tests\cli --exclude="^test_[2-9]"
+```
+
+### Tests for CLI Commands
+
+### build
+
+Tests for `tns platform add/list/remove/update` commands.
+
+Tests for `tns prepare` and `tns build` commands.
+
+Tests for `tns install` command.
+
+### create
+
+Tests for `tns create` and `tns init` commands.
+
+### debug
+
+Tests for `tns debug` command.
+
+### misc
+
+Tests for `tns appstore` command.
+
+Tests fot `tns autocomplete`.
+
+Tests for `tns doctor`.
+
+Tests for `tns help <command>`.
+
+Tests for `tns proxy`.
+
+Tests for `tns setup`.
+
+Tests for `usage-reporting` and `error-reporting` commands
+
+### plugin
+Tests for `tns plugin` command.
+
+### preview
+Tests for `tns preview` command.
+
+### resources
+Tests for `resources update` command.
+
+### run
+Tests for `tns run`, `tns deploy` and `tns device` commands.
+
+### test
+Tests for `tns Tests init` and `tns test` commands.
+   
+### update
+Tests for `update` command.
\ No newline at end of file
diff --git a/tests/cli/test/test.md b/tests/cli/test/test.md
new file mode 100644
index 00000000..870087b0
--- /dev/null
+++ b/tests/cli/test/test.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**test**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/project/testing/test.md
\ No newline at end of file
diff --git a/tests/cli/update/update.md b/tests/cli/update/update.md
new file mode 100644
index 00000000..5630b438
--- /dev/null
+++ b/tests/cli/update/update.md
@@ -0,0 +1,4 @@
+#Tests to be writen
+
+**update**
+https://github.com/NativeScript/nativescript-cli/blob/master/docs/man_pages/general/update.md