diff --git a/BUILD b/BUILD
index 1d1ecf849c..805ee7c629 100644
--- a/BUILD
+++ b/BUILD
@@ -65,6 +65,8 @@ pkg_tar(
     name = "libtrtorch",
     srcs = [
         "//:LICENSE",
+        "//bzl_def:BUILD",
+        "//bzl_def:WORKSPACE"
     ],
     extension = "tar.gz",
     package_dir = "trtorch",
diff --git a/WORKSPACE b/WORKSPACE
index 0b443be7ff..217679811f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -31,6 +31,13 @@ git_repository(
     shallow_since = "1570114335 -0400",
 )
 
+# External dependency for trtorch if you already have precompiled binaries.
+# This is currently used in pytorch NGC container CI testing.
+local_repository(
+    name = "trtorch",
+    path = "/opt/conda/lib/python3.8/site-packages/trtorch"
+)
+
 # CUDA should be installed on the system locally
 new_local_repository(
     name = "cuda",
diff --git a/bzl_def/BUILD b/bzl_def/BUILD
new file mode 100644
index 0000000000..de5cb594ae
--- /dev/null
+++ b/bzl_def/BUILD
@@ -0,0 +1,79 @@
+package(default_visibility = ["//visibility:public"])
+
+config_setting(
+    name = "aarch64_linux",
+    constraint_values = [
+        "@platforms//cpu:aarch64",
+        "@platforms//os:linux",
+    ],
+)
+
+config_setting(
+    name = "windows",
+    constraint_values = [
+        "@platforms//os:windows",
+    ],
+)
+
+cc_library(
+    name = "libtrtorch",
+    srcs = select({
+    ":windows": [
+        "lib/x64/trtorch.dll",
+    ],
+    "//conditions:default": [
+        "lib/libtrtorch.so",
+    ],
+    }),
+    hdrs = glob([
+        "include/**/*.h",
+    ]),
+    strip_include_prefix = "include",
+    includes = ["include/"]
+)
+
+cc_library(
+    name = "libtrtorchrt",
+    srcs = select({
+        ":windows": [
+            "lib/x64/trtorchrt.dll"
+        ],
+        "//conditions:default": [
+            "lib/libtrtorchrt.so"
+        ]
+    })
+)
+
+cc_library(
+    name = "libtrtorch_plugins",
+    srcs = select({
+        ":windows": [
+            "lib/x64/trtorch_plugins.dll"
+        ],
+        "//conditions:default": [
+            "lib/libtrtorch_plugins.so"
+        ]
+    }),
+    hdrs = glob([
+        "include/trtorch/core/plugins/**/*.h",
+    ]),
+    strip_include_prefix = "include",
+    includes = ["include/"]
+)
+
+cc_library(
+    name = "trtorch_core_hdrs",
+    hdrs = glob([
+        "include/trtorch/core/**/*.h"
+    ]),
+    strip_include_prefix = "include/trtorch",
+    includes = ["include/trtorch/"]
+)
+
+# Alias for ease of use
+cc_library(
+    name = "trtorch",
+    deps = [
+        ":libtrtorch",
+    ]
+)
\ No newline at end of file
diff --git a/bzl_def/BUILD.bazel b/bzl_def/BUILD.bazel
new file mode 100644
index 0000000000..9dd0f59f6e
--- /dev/null
+++ b/bzl_def/BUILD.bazel
@@ -0,0 +1,6 @@
+package(default_visibility = ["//visibility:public"])
+
+exports_files([
+	"WORKSPACE",
+	"BUILD"
+])
\ No newline at end of file
diff --git a/bzl_def/WORKSPACE b/bzl_def/WORKSPACE
new file mode 100644
index 0000000000..cb50ef1d93
--- /dev/null
+++ b/bzl_def/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "trtorch")
\ No newline at end of file
diff --git a/docker/WORKSPACE.cu.docker b/docker/WORKSPACE.cu.docker
index c2ed3b9228..586340becc 100755
--- a/docker/WORKSPACE.cu.docker
+++ b/docker/WORKSPACE.cu.docker
@@ -29,6 +29,13 @@ git_repository(
     shallow_since = "1570114335 -0400"
 )
 
+# External dependency for trtorch if you already have precompiled binaries.
+# This is currently used in pytorch NGC container CI testing.
+local_repository(
+    name = "trtorch",
+    path = "/opt/conda/lib/python3.8/site-packages/trtorch"
+)
+
 # CUDA should be installed on the system locally
 new_local_repository(
     name = "cuda",
diff --git a/py/setup.py b/py/setup.py
index 7f67aace5f..c645d5b58a 100644
--- a/py/setup.py
+++ b/py/setup.py
@@ -72,7 +72,7 @@ def is_exe(fpath):
 
 def build_libtrtorch_pre_cxx11_abi(develop=True, use_dist_dir=True, cxx11_abi=False):
     cmd = [BAZEL_EXE, "build"]
-    cmd.append("//cpp/lib:libtrtorch.so")
+    cmd.append("//:libtrtorch")
     if develop:
         cmd.append("--compilation_mode=dbg")
     else:
@@ -115,7 +115,7 @@ def copy_libtrtorch(multilinux=False):
     if multilinux:
         copyfile(dir_path + "/build/libtrtorch_build/libtrtorch.so", dir_path + '/trtorch/lib/libtrtorch.so')
     else:
-        copyfile(dir_path + "/../bazel-bin/cpp/lib/libtrtorch.so", dir_path + '/trtorch/lib/libtrtorch.so')
+        os.system("tar -xzf ../bazel-bin/libtrtorch.tar.gz --strip-components=2 -C " + dir_path + "/trtorch")
 
 
 class DevelopCommand(develop):
@@ -172,7 +172,8 @@ def run(self):
 class CleanCommand(Command):
     """Custom clean command to tidy up the project root."""
     PY_CLEAN_FILES = [
-        './build', './dist', './trtorch/__pycache__', './trtorch/lib', './*.pyc', './*.tgz', './*.egg-info'
+        './build', './dist', './trtorch/__pycache__', './trtorch/lib', './trtorch/include', './trtorch/bin', './*.pyc',
+        './*.tgz', './*.egg-info'
     ]
     description = "Command to tidy up the project root"
     user_options = []
@@ -258,9 +259,18 @@ def run(self):
       python_requires='>=3.6',
       include_package_data=True,
       package_data={
-          'trtorch': ['lib/*.so'],
+          'trtorch': [
+              'lib/*', 'include/trtorch/*.h', 'include/trtorch/core/*.h', 'include/trtorch/core/conversion/*.h',
+              'include/trtorch/core/conversion/conversionctx/*.h', 'include/trtorch/core/conversion/converters/*.h',
+              'include/trtorch/core/conversion/evaluators/*.h', 'include/trtorch/core/conversion/tensorcontainer/*.h',
+              'include/trtorch/core/conversion/var/*.h', 'include/trtorch/core/ir/*.h',
+              'include/trtorch/core/lowering/*.h', 'include/trtorch/core/lowering/passes/*.h',
+              'include/trtorch/core/partitioning/*.h', 'include/trtorch/core/plugins/*.h',
+              'include/trtorch/core/plugins/impl/*.h', 'include/trtorch/core/runtime/*.h',
+              'include/trtorch/core/util/*.h', 'include/trtorch/core/util/logging/*.h', 'bin/*', 'BUILD', 'WORKSPACE'
+          ],
       },
       exclude_package_data={
-          '': ['*.cpp', '*.h'],
+          '': ['*.cpp'],
           'trtorch': ['csrc/*.cpp'],
       })
diff --git a/tests/BUILD b/tests/BUILD
index ffdcd10281..738d5363a8 100644
--- a/tests/BUILD
+++ b/tests/BUILD
@@ -1,3 +1,10 @@
+config_setting(
+    name = "ci_build_testing",
+    values  = {
+        "define": "trtorch_src=pre_built"
+    }
+)
+
 test_suite(
     name = "tests",
     tests = [
diff --git a/tests/README.md b/tests/README.md
index d5b1d11356..ab159d9176 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -6,10 +6,37 @@ The goal of Converter tests are to tests individual converters againsts specific
 
 Module tests are designed to test the compiler against common network architectures and verify the integration of converters together into a single engine.
 
+In addition to the above, we have lowering tests (`//core/lowering`) which test the functionality of lowering passes and partitioning tests (`//core/partitioning `) which test different cases of torch fallback on test networks.
+
 You can run the whole test suite with bazel. But be aware you may exhaust GPU memory (this may be seen as a cuDNN initialization error) running them naively, you therefore may need to limit the number of concurrent tests. Also because the inputs to tests are random it may make sense to run tests a few times.
 
-Here are some settings that work well the current test suite on a TITAN V.
+Here are some settings that we usually test with:
 
 ```
 bazel test //tests --compilation_mode=dbg --test_output=errors --jobs=4 --runs_per_test=5
 ```
+
+`--runs_per_test` is optional and can be performed to check if numerical issues in outputs persist across multiple runs.
+
+`--jobs=4` is useful and is sometimes required to prevent too many processes to use GPU memory and cause CUDA out of memory issues.
+
+### Testing using pre-built TRTorch library
+
+Currently, the default strategy when we run all the tests (`bazel test //tests`) is to build the testing scripts along with the full TRTorch library (`libtrtorch.so`) from scratch. This can lead to increased testing time and might not be needed incase you already have a pre-built TRTorch library that you want to link against.
+
+In order to **not** build the entire TRTorch library and only build the test scripts, please use the following command.
+
+```
+bazel test //tests  --compilation_mode=dbg --test_output=summary --define trtorch_src=pre_built --jobs 2
+```
+
+ The flag `--define trtorch_src=pre_built` signals bazel to use pre-compiled library as an external dependency for tests. The pre-compiled library path is defined as a `local_repository` rule in root `WORKSPACE` file (`https://github.com/NVIDIA/TRTorch/blob/master/WORKSPACE`).
+
+```
+# External dependency for trtorch if you already have precompiled binaries.
+# This is currently used in pytorch NGC container CI testing.
+local_repository(
+    name = "trtorch",
+    path = "/opt/pytorch/trtorch"
+)
+```
diff --git a/tests/core/conversion/converters/converter_test.bzl b/tests/core/conversion/converters/converter_test.bzl
index 61fcee8499..4d4ba6c0e0 100644
--- a/tests/core/conversion/converters/converter_test.bzl
+++ b/tests/core/conversion/converters/converter_test.bzl
@@ -5,7 +5,6 @@ def converter_test(name, visibility = None):
         visibility = visibility,
         deps = [
             "//tests/util",
-            "//core",
             "@googletest//:gtest_main",
         ] + select({
             ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
diff --git a/tests/core/conversion/evaluators/evaluator_test.bzl b/tests/core/conversion/evaluators/evaluator_test.bzl
index 0c77b5b656..333d427045 100644
--- a/tests/core/conversion/evaluators/evaluator_test.bzl
+++ b/tests/core/conversion/evaluators/evaluator_test.bzl
@@ -5,7 +5,6 @@ def evaluator_test(name, visibility = None):
         visibility = visibility,
         deps = [
             "//tests/util",
-            "//core",
             "@googletest//:gtest_main",
         ] + select({
             ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
diff --git a/tests/core/lowering/BUILD b/tests/core/lowering/BUILD
index 522731ee5b..ec9182ac12 100644
--- a/tests/core/lowering/BUILD
+++ b/tests/core/lowering/BUILD
@@ -16,7 +16,6 @@ cc_test(
   srcs = ["test_module_fallback_passes.cpp"],
   deps = [
       "//tests/util",
-      "//core",
       "@googletest//:gtest_main",
   ] + select({
       ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
diff --git a/tests/core/lowering/lowering_test.bzl b/tests/core/lowering/lowering_test.bzl
index d053fb55c0..8d6708ea36 100644
--- a/tests/core/lowering/lowering_test.bzl
+++ b/tests/core/lowering/lowering_test.bzl
@@ -5,7 +5,6 @@ def lowering_test(name, visibility = None):
         visibility = visibility,
         deps = [
             "//tests/util",
-            "//core",
             "@googletest//:gtest_main",
         ] + select({
             ":use_pre_cxx11_abi": ["@libtorch_pre_cxx11_abi//:libtorch"],
diff --git a/tests/core/partitioning/BUILD b/tests/core/partitioning/BUILD
index b8f0d92ea2..8c13b983d2 100644
--- a/tests/core/partitioning/BUILD
+++ b/tests/core/partitioning/BUILD
@@ -37,7 +37,6 @@ cc_test(
   srcs = ["test_fallback_graph_output.cpp"],
   deps = [
       "//tests/util",
-      "//core",
       "@googletest//:gtest_main",
   ] + select({
       ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
@@ -69,7 +68,6 @@ cc_test(
   srcs = ["test_conditionals.cpp"],
   deps = [
       "//tests/util",
-      "//core",
       "@googletest//:gtest_main",
   ] + select({
       ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
@@ -91,4 +89,4 @@ test_suite(
         ":test_loop_fallback",
         ":test_conditionals"
     ]
-)
\ No newline at end of file
+)
diff --git a/tests/core/partitioning/partitioning_test.bzl b/tests/core/partitioning/partitioning_test.bzl
index 2c11a38b08..0998d73b90 100644
--- a/tests/core/partitioning/partitioning_test.bzl
+++ b/tests/core/partitioning/partitioning_test.bzl
@@ -5,7 +5,6 @@ def partitioning_test(name, visibility=None):
         visibility = visibility,
         deps = [
             "//tests/util",
-            "//core",
             "@googletest//:gtest_main",
         ] + select({
             ":use_pre_cxx11_abi":  ["@libtorch_pre_cxx11_abi//:libtorch"],
diff --git a/tests/cpp/BUILD b/tests/cpp/BUILD
index a4d73c1d62..af038ab5d8 100644
--- a/tests/cpp/BUILD
+++ b/tests/cpp/BUILD
@@ -76,7 +76,6 @@ cc_test(
         "//tests/modules:jit_models",
     ],
     deps = [
-        "//cpp:trtorch",
         "//tests/util",
         "@googletest//:gtest_main",
     ] + select({
@@ -115,7 +114,6 @@ cc_test(
         "//tests/modules:jit_models",
     ],
     deps = [
-        "//cpp:trtorch",
         "//tests/util",
         "@googletest//:gtest_main",
     ] + select({
@@ -150,7 +148,6 @@ cc_library(
     name = "cpp_api_test",
     hdrs = ["cpp_api_test.h"],
     deps = [
-        "//cpp:trtorch",
         "//tests/util",
         "@googletest//:gtest_main",
     ] + select({
diff --git a/tests/util/BUILD b/tests/util/BUILD
index 6d2db65158..ab5cae6161 100644
--- a/tests/util/BUILD
+++ b/tests/util/BUILD
@@ -20,9 +20,6 @@ cc_library(
         "util.h",
     ],
     deps = [
-        "//core/conversion",
-        "//core/util:prelude",
-        "//cpp:trtorch",
         "@tensorrt//:nvinfer",
     ] + select({
         ":use_pre_cxx11_abi": [
@@ -33,5 +30,15 @@ cc_library(
             "@libtorch//:libtorch",
             "@libtorch//:caffe2",
         ],
+    }) + select({
+        "//tests:ci_build_testing": [
+            "@trtorch//:trtorch",
+            "@trtorch//:trtorch_core_hdrs"
+        ],
+        "//conditions:default": [
+            "//cpp:trtorch",
+            "//core/conversion",
+            "//core/util:prelude"
+        ]
     }),
 )