diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39f08f1..d0d8f75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,12 +1,49 @@
+  
 version: 2.1
+workflows:
+  build_and_test:
+    jobs:
+      - build
+      - lint:
+          requires:
+            - build
+      - tests:
+          requires:
+            - build
 jobs:
   build:
-    docker: 
-      - image: cimg/node:14.10.1 # the primary container, where your job's commands are run
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+    docker:
+      - image: cimg/node:14.10.1
     steps:
-      - checkout # check out the code in the project directory
-      - run: echo "hello world" # run the `echo` command qsdsqd
-      
\ No newline at end of file
+      - checkout
+      - restore_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}
+      - run: yarn global add node-gyp && yarn install
+      - save_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}      
+          paths:
+            - ./node_modules
+  tests:
+    docker:
+      - image: cimg/node:14.10.1
+    steps: 
+      - checkout
+      - restore_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}
+      - run: yarn test:ci
+      - save_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}      
+          paths:
+            - ./node_modules
+  lint:
+    docker:
+      - image: cimg/node:14.10.1
+    steps:
+      - checkout
+      - restore_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}
+      - run: yarn lint && yarn format:check
+      - save_cache:
+          key: yarn-packages-v3{{ checksum "yarn.lock" }}      
+          paths:
+            - ./node_modules
\ No newline at end of file
diff --git a/package.json b/package.json
index a4f54c1..09baa8a 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,8 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"./**/*.{yaml,yml}\"",
-    "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\" \"./**/*.{yaml,yml}\"",
-    "generate": "hygen"
+      "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+      "format:check": "prettier --list-different \"src/**/*.ts\" \"test/**/*.ts\""
   },
   "dependencies": {
     "@hapi/joi": "^16.1.5",