diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b4ffad7..81c4203 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -16,5 +16,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Invoke CLI testing ${{ matrix.features }} against ${{ matrix.baseImage }}
-        run: npx --yes ./dev-containers-cli-0.1.0.tgz features-test -c `pwd`/collection -f ${{ matrix.features }}
+      - name: " Testing '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
+        run: npx --yes ./dev-containers-cli-0.1.0.tgz features-test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} -d `pwd` 
diff --git a/collection/dotnet/test.sh b/collection/dotnet/test.sh
deleted file mode 100644
index cdaa50a..0000000
--- a/collection/dotnet/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo 'Testing dotnet!'
-
-dotnet --list-sdks
-
-echo 'Done!'
\ No newline at end of file
diff --git a/collection/go/test.sh b/collection/go/test.sh
deleted file mode 100644
index a2c26b6..0000000
--- a/collection/go/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-go version
-
-echo 'Done!'
\ No newline at end of file
diff --git a/dev-containers-cli-0.1.0.tgz b/dev-containers-cli-0.1.0.tgz
index 1315751..f086a56 100644
Binary files a/dev-containers-cli-0.1.0.tgz and b/dev-containers-cli-0.1.0.tgz differ
diff --git a/collection/anaconda/feature.json b/src/anaconda/feature.json
similarity index 100%
rename from collection/anaconda/feature.json
rename to src/anaconda/feature.json
diff --git a/collection/anaconda/install.sh b/src/anaconda/install.sh
similarity index 100%
rename from collection/anaconda/install.sh
rename to src/anaconda/install.sh
diff --git a/collection/aws-cli/feature.json b/src/aws-cli/feature.json
similarity index 100%
rename from collection/aws-cli/feature.json
rename to src/aws-cli/feature.json
diff --git a/collection/aws-cli/install.sh b/src/aws-cli/install.sh
similarity index 100%
rename from collection/aws-cli/install.sh
rename to src/aws-cli/install.sh
diff --git a/collection/azure-cli/feature.json b/src/azure-cli/feature.json
similarity index 100%
rename from collection/azure-cli/feature.json
rename to src/azure-cli/feature.json
diff --git a/collection/azure-cli/install.sh b/src/azure-cli/install.sh
similarity index 100%
rename from collection/azure-cli/install.sh
rename to src/azure-cli/install.sh
diff --git a/collection/common/feature.json b/src/common/feature.json
similarity index 100%
rename from collection/common/feature.json
rename to src/common/feature.json
diff --git a/collection/common/install.sh b/src/common/install.sh
similarity index 100%
rename from collection/common/install.sh
rename to src/common/install.sh
diff --git a/collection/desktop-lite/feature.json b/src/desktop-lite/feature.json
similarity index 100%
rename from collection/desktop-lite/feature.json
rename to src/desktop-lite/feature.json
diff --git a/collection/desktop-lite/install.sh b/src/desktop-lite/install.sh
similarity index 100%
rename from collection/desktop-lite/install.sh
rename to src/desktop-lite/install.sh
diff --git a/collection/docker-from-docker/feature.json b/src/docker-from-docker/feature.json
similarity index 100%
rename from collection/docker-from-docker/feature.json
rename to src/docker-from-docker/feature.json
diff --git a/collection/docker-from-docker/install.sh b/src/docker-from-docker/install.sh
similarity index 100%
rename from collection/docker-from-docker/install.sh
rename to src/docker-from-docker/install.sh
diff --git a/collection/docker-in-docker/feature.json b/src/docker-in-docker/feature.json
similarity index 100%
rename from collection/docker-in-docker/feature.json
rename to src/docker-in-docker/feature.json
diff --git a/collection/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
similarity index 100%
rename from collection/docker-in-docker/install.sh
rename to src/docker-in-docker/install.sh
diff --git a/collection/dotnet/feature.json b/src/dotnet/feature.json
similarity index 100%
rename from collection/dotnet/feature.json
rename to src/dotnet/feature.json
diff --git a/collection/dotnet/install.sh b/src/dotnet/install.sh
similarity index 100%
rename from collection/dotnet/install.sh
rename to src/dotnet/install.sh
diff --git a/collection/git-lfs/feature.json b/src/git-lfs/feature.json
similarity index 100%
rename from collection/git-lfs/feature.json
rename to src/git-lfs/feature.json
diff --git a/collection/git-lfs/install.sh b/src/git-lfs/install.sh
similarity index 100%
rename from collection/git-lfs/install.sh
rename to src/git-lfs/install.sh
diff --git a/collection/git/feature.json b/src/git/feature.json
similarity index 100%
rename from collection/git/feature.json
rename to src/git/feature.json
diff --git a/collection/git/install.sh b/src/git/install.sh
similarity index 100%
rename from collection/git/install.sh
rename to src/git/install.sh
diff --git a/collection/github-cli/feature.json b/src/github-cli/feature.json
similarity index 100%
rename from collection/github-cli/feature.json
rename to src/github-cli/feature.json
diff --git a/collection/github-cli/install.sh b/src/github-cli/install.sh
similarity index 100%
rename from collection/github-cli/install.sh
rename to src/github-cli/install.sh
diff --git a/collection/go/feature.json b/src/go/feature.json
similarity index 100%
rename from collection/go/feature.json
rename to src/go/feature.json
diff --git a/collection/go/install.sh b/src/go/install.sh
similarity index 100%
rename from collection/go/install.sh
rename to src/go/install.sh
diff --git a/collection/gradle/feature.json b/src/gradle/feature.json
similarity index 100%
rename from collection/gradle/feature.json
rename to src/gradle/feature.json
diff --git a/collection/gradle/install.sh b/src/gradle/install.sh
similarity index 100%
rename from collection/gradle/install.sh
rename to src/gradle/install.sh
diff --git a/collection/hugo/feature.json b/src/hugo/feature.json
similarity index 100%
rename from collection/hugo/feature.json
rename to src/hugo/feature.json
diff --git a/collection/hugo/install.sh b/src/hugo/install.sh
similarity index 100%
rename from collection/hugo/install.sh
rename to src/hugo/install.sh
diff --git a/collection/java/feature.json b/src/java/feature.json
similarity index 100%
rename from collection/java/feature.json
rename to src/java/feature.json
diff --git a/collection/java/install.sh b/src/java/install.sh
similarity index 100%
rename from collection/java/install.sh
rename to src/java/install.sh
diff --git a/collection/java/wrapper.sh b/src/java/wrapper.sh
similarity index 100%
rename from collection/java/wrapper.sh
rename to src/java/wrapper.sh
diff --git a/collection/jekyll/feature.json b/src/jekyll/feature.json
similarity index 100%
rename from collection/jekyll/feature.json
rename to src/jekyll/feature.json
diff --git a/collection/jekyll/install.sh b/src/jekyll/install.sh
similarity index 100%
rename from collection/jekyll/install.sh
rename to src/jekyll/install.sh
diff --git a/collection/jupyterlab/feature.json b/src/jupyterlab/feature.json
similarity index 100%
rename from collection/jupyterlab/feature.json
rename to src/jupyterlab/feature.json
diff --git a/collection/jupyterlab/install.sh b/src/jupyterlab/install.sh
similarity index 100%
rename from collection/jupyterlab/install.sh
rename to src/jupyterlab/install.sh
diff --git a/collection/kubectl-helm-minikube/feature.json b/src/kubectl-helm-minikube/feature.json
similarity index 100%
rename from collection/kubectl-helm-minikube/feature.json
rename to src/kubectl-helm-minikube/feature.json
diff --git a/collection/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
similarity index 100%
rename from collection/kubectl-helm-minikube/install.sh
rename to src/kubectl-helm-minikube/install.sh
diff --git a/collection/maven/feature.json b/src/maven/feature.json
similarity index 100%
rename from collection/maven/feature.json
rename to src/maven/feature.json
diff --git a/collection/maven/install.sh b/src/maven/install.sh
similarity index 100%
rename from collection/maven/install.sh
rename to src/maven/install.sh
diff --git a/collection/node/feature.json b/src/node/feature.json
similarity index 100%
rename from collection/node/feature.json
rename to src/node/feature.json
diff --git a/collection/node/install.sh b/src/node/install.sh
similarity index 100%
rename from collection/node/install.sh
rename to src/node/install.sh
diff --git a/collection/powershell/feature.json b/src/powershell/feature.json
similarity index 100%
rename from collection/powershell/feature.json
rename to src/powershell/feature.json
diff --git a/collection/powershell/install.sh b/src/powershell/install.sh
similarity index 100%
rename from collection/powershell/install.sh
rename to src/powershell/install.sh
diff --git a/collection/python/feature.json b/src/python/feature.json
similarity index 100%
rename from collection/python/feature.json
rename to src/python/feature.json
diff --git a/collection/python/install.sh b/src/python/install.sh
similarity index 100%
rename from collection/python/install.sh
rename to src/python/install.sh
diff --git a/collection/ruby/feature.json b/src/ruby/feature.json
similarity index 100%
rename from collection/ruby/feature.json
rename to src/ruby/feature.json
diff --git a/collection/ruby/install.sh b/src/ruby/install.sh
similarity index 100%
rename from collection/ruby/install.sh
rename to src/ruby/install.sh
diff --git a/collection/rust/feature.json b/src/rust/feature.json
similarity index 100%
rename from collection/rust/feature.json
rename to src/rust/feature.json
diff --git a/collection/rust/install.sh b/src/rust/install.sh
similarity index 100%
rename from collection/rust/install.sh
rename to src/rust/install.sh
diff --git a/collection/sshd/feature.json b/src/sshd/feature.json
similarity index 100%
rename from collection/sshd/feature.json
rename to src/sshd/feature.json
diff --git a/collection/sshd/install.sh b/src/sshd/install.sh
similarity index 100%
rename from collection/sshd/install.sh
rename to src/sshd/install.sh
diff --git a/collection/terraform/feature.json b/src/terraform/feature.json
similarity index 100%
rename from collection/terraform/feature.json
rename to src/terraform/feature.json
diff --git a/collection/terraform/install.sh b/src/terraform/install.sh
similarity index 100%
rename from collection/terraform/install.sh
rename to src/terraform/install.sh
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
new file mode 100644
index 0000000..781fc16
--- /dev/null
+++ b/test/dotnet/test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source featuresTest.library.sh root
+
+# Definition specific tests
+check "dotnet" dotnet --info
+check "sdks" dotnet --list-sdks
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/test.sh b/test/go/test.sh
new file mode 100644
index 0000000..a41e89a
--- /dev/null
+++ b/test/go/test.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source featuresTest.library.sh root
+
+check "version" go version
+
+# Report result
+reportResults
\ No newline at end of file