diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0772da..e511520 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,10 +18,18 @@ jobs:
   build:
     name: 'Rust Build'
     runs-on: ubuntu-latest
+    services:
+      vault:
+        image: hashicorp/vault:1.17.1
+        ports:
+          - 8200:8200
+        options: --cap-add=IPC_LOCK
+        env:
+          VAULT_DEV_ROOT_TOKEN_ID: 'root-token'
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Install stable toolchain
+      - name: Install stable Toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: ${{ env.TOOLCHAIN_PROFILE }}
@@ -40,10 +48,11 @@ jobs:
         with:
           command: clippy
       #    args: -- -D warnings
-      - name: Unit- and Integration-Tests
+      - name: Unit and Integration Tests
         uses: actions-rs/cargo@v1
         env:
           RUST_TEST_THREADS: 1
+          VAULT_TOKEN: 'root-token'
         with:
           command: test
       - name: Build Binary
@@ -56,40 +65,6 @@ jobs:
         with:
           name: cli
           path: target/release/propeller
-  test:
-    name: 'Integration Test CLI'
-    needs: build
-    runs-on: ubuntu-latest
-    services:
-      vault:
-        image: hashicorp/vault:1.17.1
-        ports:
-          - 8200:8200
-        options: --cap-add=IPC_LOCK
-        env:
-          VAULT_DEV_ROOT_TOKEN_ID: 'root-token'
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          name: cli
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20.15.0
-          cache: 'npm'
-      - name: Install node.js packages
-        run: npm ci
-      - name: Wait for Vault
-        run: npm run ci:wait-for-vault
-      - name: Download Binary
-        uses: actions/download-artifact@v4
-      - name: Run integration tests
-        run: |
-          chmod 755 ./cli/propeller
-          ./cli/propeller init-vault -c dev/config.yml
-        env:
-          VAULT_TOKEN: 'root-token'
   check:
     name: 'Resources Validation'
     runs-on: ubuntu-latest
diff --git a/.idea/runConfigurations/Test_propeller.xml b/.idea/runConfigurations/Build_propeller.xml
similarity index 79%
rename from .idea/runConfigurations/Test_propeller.xml
rename to .idea/runConfigurations/Build_propeller.xml
index 6603343..ded5306 100644
--- a/.idea/runConfigurations/Test_propeller.xml
+++ b/.idea/runConfigurations/Build_propeller.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test propeller" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="test --workspace" />
+  <configuration default="false" name="Build propeller" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="build" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs />
     <option name="emulateTerminal" value="true" />
diff --git a/.idea/runConfigurations/Integration_Test_propeller.xml b/.idea/runConfigurations/Integration_Test_propeller.xml
new file mode 100644
index 0000000..56e46ce
--- /dev/null
+++ b/.idea/runConfigurations/Integration_Test_propeller.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Integration-Test propeller" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="test --test *" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
+    <option name="emulateTerminal" value="true" />
+    <option name="channel" value="DEFAULT" />
+    <option name="requiredFeatures" value="true" />
+    <option name="allFeatures" value="false" />
+    <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
+    <option name="backtrace" value="SHORT" />
+    <option name="isRedirectInput" value="false" />
+    <option name="redirectInputPath" value="" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Unit_Test_propeller.xml b/.idea/runConfigurations/Unit_Test_propeller.xml
new file mode 100644
index 0000000..7419a8a
--- /dev/null
+++ b/.idea/runConfigurations/Unit_Test_propeller.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unit-Test propeller" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="test --bin propeller" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
+    <option name="emulateTerminal" value="true" />
+    <option name="channel" value="DEFAULT" />
+    <option name="requiredFeatures" value="true" />
+    <option name="allFeatures" value="false" />
+    <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
+    <option name="backtrace" value="SHORT" />
+    <option name="isRedirectInput" value="false" />
+    <option name="redirectInputPath" value="" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_propeller__rotate.xml b/.idea/runConfigurations/propeller__init_vault.xml
similarity index 88%
rename from .idea/runConfigurations/Run_propeller__rotate.xml
rename to .idea/runConfigurations/propeller__init_vault.xml
index 26ebce3..a06b2bc 100644
--- a/.idea/runConfigurations/Run_propeller__rotate.xml
+++ b/.idea/runConfigurations/propeller__init_vault.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run propeller: rotate" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --package propeller --bin propeller -- rotate -c dev/config.yml" />
+  <configuration default="false" name="propeller: init-vault" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="run --package propeller --bin propeller -- init-vault -c dev/config.yml" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs>
       <env name="VAULT_TOKEN" value="root-token" />
diff --git a/.idea/runConfigurations/Run_propeller__init_vault.xml b/.idea/runConfigurations/propeller__rotate.xml
similarity index 82%
rename from .idea/runConfigurations/Run_propeller__init_vault.xml
rename to .idea/runConfigurations/propeller__rotate.xml
index 0445d65..7c2a1df 100644
--- a/.idea/runConfigurations/Run_propeller__init_vault.xml
+++ b/.idea/runConfigurations/propeller__rotate.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run propeller: init-vault" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --package propeller --bin propeller -- init-vault -c dev/config.yml" />
+  <configuration default="false" name="propeller: rotate" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="run --package propeller --bin propeller -- rotate -c dev/config.yml" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs>
       <env name="VAULT_TOKEN" value="root-token" />
diff --git a/Cargo.toml b/Cargo.toml
index de62f71..c55a59c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,3 +13,9 @@ serde_yaml = "0.9.34+deprecated"
 tokio = { version = "1.38.0", features = ["macros", "rt"] }
 vaultrs = "0.7.2"
 rand = "0.9.0-alpha.1"
+
+[dev-dependencies]
+assert_cmd = "2.0.14"
+predicates = "3.1.0"
+reqwest = { version = "0.12.5", features = ["json"] }
+serde_json = "1.0.120"
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index f7d3306..74b92b8 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -8,10 +8,11 @@ Before you start, ensure you have the following installed:
 
 - [Git](https://git-scm.com/downloads): For version control
   - Git LFS: For managing large files within the project
-- [Node.js](https://nodejs.org/en/download: For running certain project scripts (including dependency management)
+- [Node.js](https://nodejs.org/en/download): For running certain project scripts (including dependency management)
 - [`podman`](https://podman.io/docs/installation) or [Docker](https://www.docker.com/products/docker-desktop/): For containerization of the Vault instance and databases
+  - This is especially required for [integration testing](#running-tests)
 
-## Cloning the Repository
+## Preparing the Repository
 
 1. Clone the `propeller` project from GitHub:
 
@@ -52,7 +53,7 @@ npm ci --cache .npm
 - **A Vault instance:** For managing secrets
 
 Note that if using any of the below options, Vault will be accessible on http://localhost:8200.
-Extract the root token from the logs of the container.
+The root token for development is 'root-token'.
 
 ### Setting up with `podman`:
 
@@ -93,6 +94,8 @@ Cargo makes it easy to run the project's unit and integration tests:
 cargo tests
 ```
 
+**Note that the integration tests need active Vault and PostgreSQL connections, as described [here](#environment-setup).**
+
 Cargo will automatically discover and execute the tests defined within the project.
 
 ### Running the CLI
diff --git a/package-lock.json b/package-lock.json
index ec20cc0..92e7d63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,8 +16,7 @@
         "husky": "^9.0.11",
         "lint-staged": "^15.2.7",
         "prettier": "^3.3.2",
-        "prettier-plugin-packagejson": "^2.5.0",
-        "wait-on": "^7.2.0"
+        "prettier-plugin-packagejson": "^2.5.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -358,23 +357,6 @@
         "node": ">=v18"
       }
     },
-    "node_modules/@hapi/hoek": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@hapi/topo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@hapi/hoek": "^9.0.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1189,30 +1171,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@sideway/address": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
-      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@hapi/hoek": "^9.0.0"
-      }
-    },
-    "node_modules/@sideway/formula": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@sideway/pinpoint": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
@@ -1392,25 +1350,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/before-after-hook": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
@@ -1987,19 +1926,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/commander": {
       "version": "12.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
@@ -2304,16 +2230,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/detect-indent": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-7.0.1.tgz",
@@ -2603,42 +2519,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/from2": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
@@ -3263,20 +3143,6 @@
         "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/joi": {
-      "version": "17.13.3",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
-      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@hapi/hoek": "^9.3.0",
-        "@hapi/topo": "^5.1.0",
-        "@sideway/address": "^4.1.5",
-        "@sideway/formula": "^3.0.1",
-        "@sideway/pinpoint": "^2.0.0"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -3756,29 +3622,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/mimic-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -7164,13 +7007,6 @@
       "license": "ISC",
       "peer": true
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -7439,16 +7275,6 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -8388,26 +8214,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/wait-on": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
-      "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "axios": "^1.6.1",
-        "joi": "^17.11.0",
-        "lodash": "^4.17.21",
-        "minimist": "^1.2.8",
-        "rxjs": "^7.8.1"
-      },
-      "bin": {
-        "wait-on": "bin/wait-on"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index 36a0029..2444a0b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
   "license": "Apache-2.0",
   "author": "PostFinance AG",
   "scripts": {
-    "ci:wait-for-vault": "wait-on --timeout 60s tcp:8200",
     "prepare": "husky",
     "prettier": "prettier \"{,.github/workflows/,dev/}*.{md,js,json,yml}\"",
     "prettier:check": "npm run prettier -- --check",
@@ -28,7 +27,6 @@
     "husky": "^9.0.11",
     "lint-staged": "^15.2.7",
     "prettier": "^3.3.2",
-    "prettier-plugin-packagejson": "^2.5.0",
-    "wait-on": "^7.2.0"
+    "prettier-plugin-packagejson": "^2.5.0"
   }
 }
diff --git a/src/config.rs b/src/config.rs
index bf27c7a..7946e04 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -32,3 +32,29 @@ pub(crate) fn read_config(config_path: PathBuf) -> Config {
 
     serde_yaml::from_str(&config_data).expect("Failed to parse configuration")
 }
+
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic(
+        expected = "Failed to read configuration file: 'tests/resources/config/non_existing.yml'"
+    )]
+    fn read_config_invalid_file() {
+        read_config(PathBuf::from("tests/resources/config/non_existing.yml"));
+    }
+
+    #[test]
+    #[should_panic(expected = "Failed to parse configuration: Error(\"missing field `postgres`")]
+    fn read_config_missing_postgresql() {
+        read_config(PathBuf::from(
+            "tests/resources/config/missing_postgresql.yml",
+        ));
+    }
+
+    #[test]
+    #[should_panic(expected = "Failed to parse configuration: Error(\"missing field `vault`")]
+    fn read_config_missing_vault() {
+        read_config(PathBuf::from("tests/resources/config/missing_vault.yml"));
+    }
+}
diff --git a/src/password.rs b/src/password.rs
index d8b49ea..c660219 100644
--- a/src/password.rs
+++ b/src/password.rs
@@ -10,11 +10,11 @@ pub(crate) fn generate_random_password(length: usize) -> String {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::*;
 
     #[test]
-    fn test_password_length() {
+    fn password_length() {
         for length in vec![8, 16, 32] {
             let password = generate_random_password(length);
             assert_eq!(password.len(), length);
@@ -22,7 +22,7 @@ mod test {
     }
 
     #[test]
-    fn test_password_content() {
+    fn password_content() {
         let password = generate_random_password(10);
         assert!(password.chars().all(|c| c.is_alphanumeric()));
         assert!(password.chars().any(|c| c.is_lowercase()));
diff --git a/src/vault.rs b/src/vault.rs
index 3991df4..8ba96a2 100644
--- a/src/vault.rs
+++ b/src/vault.rs
@@ -99,13 +99,13 @@ fn get_vault_client(config: &Config) -> VaultClient {
     vault_client
 }
 
-mod test {
+mod tests {
     use super::*;
     use crate::config::PostgresConfig;
     use vaultrs::client::Client;
 
     #[test]
-    fn test_vault_connect() {
+    fn successful_vault_connect() {
         let config = Config {
             postgres: PostgresConfig {
                 jdbc_url: "".to_string(),
@@ -125,7 +125,7 @@ mod test {
 
     #[test]
     #[should_panic(expected = "Missing VAULT_TOKEN environment variable")]
-    fn test_vault_connect_missing_token() {
+    fn vault_connect_missing_token() {
         let config = Config {
             postgres: PostgresConfig {
                 jdbc_url: "".to_string(),
@@ -141,7 +141,7 @@ mod test {
     }
 
     #[test]
-    fn test_get_vault_client() {
+    fn get_vault_client_returns_client() {
         let config = Config {
             postgres: PostgresConfig {
                 jdbc_url: "".to_string(),
diff --git a/src/workflow.rs b/src/workflow.rs
index cf0d73f..1a851b1 100644
--- a/src/workflow.rs
+++ b/src/workflow.rs
@@ -66,19 +66,12 @@ fn update_passive_user_password(secret: &mut VaultStructure, new_password: Strin
     }
 }
 
-mod test {
+mod tests {
     use super::*;
 
     #[test]
-    fn test_switch_active_user_user1_active() {
-        let mut secret = VaultStructure {
-            postgresql_active_user: "user1".to_string(),
-            postgresql_active_user_password: "password1".to_string(),
-            postgresql_user_1: "user1".to_string(),
-            postgresql_user_1_password: "password1".to_string(),
-            postgresql_user_2: "user2".to_string(),
-            postgresql_user_2_password: "password2".to_string(),
-        };
+    fn switch_active_user_user1_active() {
+        let mut secret: VaultStructure = create_vault_structure_active_user_1();
 
         switch_active_user(&mut secret);
 
@@ -87,15 +80,8 @@ mod test {
     }
 
     #[test]
-    fn test_switch_active_user_user2_active() {
-        let mut secret = VaultStructure {
-            postgresql_active_user: "user2".to_string(),
-            postgresql_active_user_password: "password2".to_string(),
-            postgresql_user_1: "user1".to_string(),
-            postgresql_user_1_password: "password1".to_string(),
-            postgresql_user_2: "user2".to_string(),
-            postgresql_user_2_password: "password2".to_string(),
-        };
+    fn switch_active_user_user2_active() {
+        let mut secret: VaultStructure = create_vault_structure_active_user_2();
 
         switch_active_user(&mut secret);
 
@@ -104,15 +90,8 @@ mod test {
     }
 
     #[test]
-    fn test_update_passive_user_password_user1_active() {
-        let mut secret = VaultStructure {
-            postgresql_active_user: "user1".to_string(),
-            postgresql_active_user_password: "password1".to_string(),
-            postgresql_user_1: "user1".to_string(),
-            postgresql_user_1_password: "password1".to_string(),
-            postgresql_user_2: "user2".to_string(),
-            postgresql_user_2_password: "password2".to_string(),
-        };
+    fn update_passive_user_password_user1_active() {
+        let mut secret: VaultStructure = create_vault_structure_active_user_1();
 
         let new_password = "new_password".to_string();
 
@@ -124,15 +103,8 @@ mod test {
     }
 
     #[test]
-    fn test_update_passive_user_password_user2_active() {
-        let mut secret = VaultStructure {
-            postgresql_active_user: "user2".to_string(),
-            postgresql_active_user_password: "password2".to_string(),
-            postgresql_user_1: "user1".to_string(),
-            postgresql_user_1_password: "password1".to_string(),
-            postgresql_user_2: "user2".to_string(),
-            postgresql_user_2_password: "password2".to_string(),
-        };
+    fn update_passive_user_password_user2_active() {
+        let mut secret: VaultStructure = create_vault_structure_active_user_2();
 
         let new_password = "new_password".to_string();
 
@@ -142,4 +114,28 @@ mod test {
         assert_eq!(secret.postgresql_active_user_password, "password2");
         assert_eq!(secret.postgresql_user_1_password, new_password);
     }
+
+    fn create_vault_structure_active_user_1() -> VaultStructure {
+        let mut secret = VaultStructure {
+            postgresql_active_user: "user1".to_string(),
+            postgresql_active_user_password: "password1".to_string(),
+            postgresql_user_1: "user1".to_string(),
+            postgresql_user_1_password: "password1".to_string(),
+            postgresql_user_2: "user2".to_string(),
+            postgresql_user_2_password: "password2".to_string(),
+        };
+        secret
+    }
+
+    fn create_vault_structure_active_user_2() -> VaultStructure {
+        let mut secret = VaultStructure {
+            postgresql_active_user: "user2".to_string(),
+            postgresql_active_user_password: "password2".to_string(),
+            postgresql_user_1: "user1".to_string(),
+            postgresql_user_1_password: "password1".to_string(),
+            postgresql_user_2: "user2".to_string(),
+            postgresql_user_2_password: "password2".to_string(),
+        };
+        secret
+    }
 }
diff --git a/tests/init_vault.rs b/tests/init_vault.rs
new file mode 100644
index 0000000..6534159
--- /dev/null
+++ b/tests/init_vault.rs
@@ -0,0 +1,76 @@
+use std::path::PathBuf;
+use std::process::Command;
+
+use assert_cmd::cargo::cargo_bin;
+use assert_cmd::prelude::*;
+use lazy_static::lazy_static;
+use predicates::str::contains;
+use reqwest::{Client, Response};
+use serde_json::Value;
+use tokio::runtime::{Builder, Runtime};
+
+lazy_static! {
+    static ref BIN_PATH: PathBuf = cargo_bin(env!("CARGO_PKG_NAME"));
+}
+
+#[test]
+fn init_vault_new_path() {
+    Command::new(&*BIN_PATH)
+        .arg("init-vault")
+        .arg("-c")
+        .arg("tests/resources/init_vault/new_path.yml")
+        .env("VAULT_TOKEN", "root-token")
+        .assert()
+        .success()
+        .stdout(contains(
+            "Successfully initialized Vault path 'path/to/my/secret'",
+        ));
+
+    let client = Client::new();
+    let url = "http://localhost:8200/v1/secret/data/path/to/my/secret";
+
+    let rt: Runtime = create_tokio_runtime();
+
+    let response: Response = rt
+        .block_on(client.get(url).header("X-Vault-Token", "root-token").send())
+        .expect("Error receiving Vault data");
+
+    response
+        .error_for_status_ref()
+        .expect("Expected to reach Vault");
+
+    let json: Value = rt
+        .block_on(response.json())
+        .expect("Failed to convert Vault response to JSON");
+
+    assert_json_value_equals(&json, "postgresql_active_user", "TBD");
+    assert_json_value_equals(&json, "postgresql_active_user_password", "TBD");
+    assert_json_value_equals(&json, "postgresql_user_1", "TBD");
+    assert_json_value_equals(&json, "postgresql_user_1_password", "TBD");
+    assert_json_value_equals(&json, "postgresql_user_2", "TBD");
+    assert_json_value_equals(&json, "postgresql_user_2_password", "TBD");
+}
+
+#[test]
+fn init_vault_invalid_url() {
+    Command::new(&*BIN_PATH)
+        .arg("init-vault")
+        .arg("-c")
+        .arg("tests/resources/init_vault/invalid_url.yml")
+        .env("VAULT_TOKEN", "root-token")
+        .assert()
+        .failure()
+        .stderr(contains("Failed to create initial Vault structure"))
+        .stderr(contains("error sending request for url"));
+}
+
+fn create_tokio_runtime() -> Runtime {
+    Builder::new_current_thread()
+        .enable_all()
+        .build()
+        .expect("Failed to build Vault connection")
+}
+
+fn assert_json_value_equals(json: &Value, key: &str, value: &str) {
+    assert_eq!(json["data"]["data"][key].as_str().unwrap(), value);
+}
diff --git a/tests/resources/config/missing_postgresql.yml b/tests/resources/config/missing_postgresql.yml
new file mode 100644
index 0000000..d1a2dd7
--- /dev/null
+++ b/tests/resources/config/missing_postgresql.yml
@@ -0,0 +1,3 @@
+vault:
+  address: 'http://localhost:1234'
+  path: 'path/to/my/secret'
diff --git a/tests/resources/config/missing_vault.yml b/tests/resources/config/missing_vault.yml
new file mode 100644
index 0000000..a7a94a6
--- /dev/null
+++ b/tests/resources/config/missing_vault.yml
@@ -0,0 +1,2 @@
+postgres:
+  jdbc_url: 'jdbc:postgres://localhost:5432/demo'
diff --git a/tests/resources/init_vault/invalid_url.yml b/tests/resources/init_vault/invalid_url.yml
new file mode 100644
index 0000000..65f32d4
--- /dev/null
+++ b/tests/resources/init_vault/invalid_url.yml
@@ -0,0 +1,5 @@
+postgres:
+  jdbc_url: 'jdbc:postgres://localhost:5432/demo'
+vault:
+  address: 'http://localhost:1234'
+  path: 'path/to/my/secret'
diff --git a/tests/resources/init_vault/new_path.yml b/tests/resources/init_vault/new_path.yml
new file mode 100644
index 0000000..820ec71
--- /dev/null
+++ b/tests/resources/init_vault/new_path.yml
@@ -0,0 +1,5 @@
+postgres:
+  jdbc_url: 'jdbc:postgres://localhost:5432/demo'
+vault:
+  address: 'http://localhost:8200'
+  path: 'path/to/my/secret'