diff --git a/.buildkite/coverage.yml b/.buildkite/coverage.yml
deleted file mode 100644
index ded8b3651e5..00000000000
--- a/.buildkite/coverage.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-steps:
-  - label: ":spiral_note_pad: Generate Report"
-    command: |
-        echo "--- :hammer: Ensuring lcov is installed" && apt-get install -y lcov && \
-        echo "--- :hammer: Building" && \
-        cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
-        ninja && \
-        echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
-        ninja EOSIO_ut_coverage && \
-        echo "--- :arrow_up: Publishing Code Coverage Report" && \
-        buildkite-agent artifact upload "EOSIO_ut_coverage/**/*" s3://eos-coverage/$BUILDKITE_JOB_ID && \
-        echo "+++ View Report" && \
-        printf "\033]1339;url=https://eos-coverage.s3-us-west-2.amazonaws.com/$BUILDKITE_JOB_ID/EOSIO_ut_coverage/index.html;content=View Full Coverage Report\a\n"
-    agents:
-      queue: "automation-large-builder-fleet"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v3.0.1:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-        environment:
-          - LCOV_PATH=/usr/bin/lcov
-          - BOOST_ROOT=/root/opt/boost
-          - OPENSSL_ROOT_DIR=/usr/include/openssl
-          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/mongodb/bin:~/opt/llvm/bin/
-    timeout: 60
diff --git a/.buildkite/debug.yml b/.buildkite/debug.yml
deleted file mode 100644
index 3cd6b16d23a..00000000000
--- a/.buildkite/debug.yml
+++ /dev/null
@@ -1,343 +0,0 @@
-steps:
-  - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:" && \
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
-      echo "+++ Building :hammer:" && \
-      echo 1 | ./eosio_build.sh -o Debug && \
-      echo "--- Compressing build directory :compression:" && \
-      tar -pczf build.tar.gz build/
-    label: ":darwin: Mojave Build"
-    agents:
-      - "role=builder-v2-1"
-      - "os=mojave"
-    artifact_paths: "build.tar.gz"
-    timeout: 60
-
-  - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":ubuntu: 16.04 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
-        workdir: /data/job
-    timeout: 60
-    
-  - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":ubuntu: 18.04 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":fedora: 27 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
-        workdir: /data/job
-    timeout: 60
- 
-  - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":centos: 7 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":aws: 1 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
-        workdir: /data/job
-    timeout: 60
-
-    - command: |
-        echo "+++ :hammer: Building" && \
-        echo 1 | ./eosio_build.sh -o Debug && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz build/
-    label: ":aws: 2 Build"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths: "build.tar.gz"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - wait
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":darwin: Mojave Tests"
-    agents:
-      - "role=builder-v2-1"
-      - "os=mojave"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    timeout: 60
-    
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":ubuntu: 16.04 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
-        workdir: /data/job
-    timeout: 60
-  
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":ubuntu: 18.04 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":fedora: 27 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":centos: 7 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":aws: 1 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
-        workdir: /data/job
-    timeout: 60
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
-    label: ":aws: 2 Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
-        workdir: /data/job
-    timeout: 60
\ No newline at end of file
diff --git a/.buildkite/docker.yml b/.buildkite/docker.yml
deleted file mode 100644
index 9be30a77cef..00000000000
--- a/.buildkite/docker.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-steps:
-  - command: |
-        echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
-        gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
-        docker-credential-gcr configure-docker && \
-        echo "BUILDING BUILD IMAGE" && \
-        cd Docker/builder && \
-        docker build -t eosio/builder:latest -t eosio/builder:$BUILDKITE_COMMIT -t eosio/builder:$BUILDKITE_BRANCH . --build-arg branch=$BUILDKITE_COMMIT && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/builder:latest eosio/builder:$BUILDKITE_TAG || : && \
-        docker tag eosio/builder:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
-        docker tag eosio/builder:$BUILDKITE_BRANCH gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/builder:$BUILDKITE_TAG gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_TAG || : && \
-        docker tag eosio/builder:latest gcr.io/b1-automation-dev/eosio/builder:latest && \
-        echo "PUSHING DOCKER IMAGES" && \
-        docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
-        docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker push gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_TAG || : && \
-        docker push gcr.io/b1-automation-dev/eosio/builder:latest && \
-        echo "TRASHING OLD IMAGES" && \
-        docker rmi eosio/builder:$BUILDKITE_COMMIT && \
-        docker rmi eosio/builder:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi eosio/builder:$BUILDKITE_TAG || : && \
-        docker rmi eosio/builder:latest && \
-        docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
-        docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_TAG || : && \
-        docker rmi gcr.io/b1-automation-dev/eosio/builder:latest
-    label: "Docker build builder"
-    agents:
-      queue: "automation-docker-builder-fleet"
-    timeout: 300
-
-  - wait
-
-  - command: |
-        echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
-        gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
-        docker-credential-gcr configure-docker && \
-        echo "BUILDING EOS IMAGE" && \
-        docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
-        cd Docker && \
-        docker build -t eosio/eos:latest -t eosio/eos:$BUILDKITE_COMMIT -t eosio/eos:$BUILDKITE_BRANCH . --build-arg branch=$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/eos:latest eosio/eos:$BUILDKITE_TAG || : && \
-        docker tag eosio/eos:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
-        docker tag eosio/eos:$BUILDKITE_BRANCH gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/eos:$BUILDKITE_TAG gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_TAG || : && \
-        docker tag eosio/eos:latest gcr.io/b1-automation-dev/eosio/eos:latest && \
-        echo "PUSHING DOCKER IMAGES" && \
-        docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
-        docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker push gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_TAG || : && \
-        docker push gcr.io/b1-automation-dev/eosio/eos:latest && \
-        echo "TRASHING OLD IMAGES" && \
-        docker rmi eosio/eos:$BUILDKITE_COMMIT && \
-        docker rmi eosio/eos:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi eosio/eos:$BUILDKITE_TAG || : && \
-        docker rmi eosio/eos:latest && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_COMMIT && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi gcr.io/b1-automation-dev/eosio/eos:$BUILDKITE_TAG || : && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos:latest && \
-        docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
-    label: "Docker build eos"
-    agents:
-      queue: "automation-docker-builder-fleet"
-    timeout: 300
-
-  - command: |
-        echo "AUTHENTICATING GOOGLE SERVICE ACCOUNT" && \
-        gcloud --quiet auth activate-service-account b1-automation-svc@b1-automation-dev.iam.gserviceaccount.com --key-file=/etc/gcp-service-account.json && \
-        docker-credential-gcr configure-docker && \
-        echo "BUILDING EOS DEV IMAGE" && \
-        docker pull gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT && \
-        cd Docker/dev && \
-        docker build -t eosio/eos-dev:latest -t eosio/eos-dev:$BUILDKITE_COMMIT -t eosio/eos-dev:$BUILDKITE_BRANCH . --build-arg branch=$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/eos-dev:latest eosio/eos-dev:$BUILDKITE_TAG || : && \
-        docker tag eosio/eos-dev:$BUILDKITE_COMMIT gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
-        docker tag eosio/eos-dev:$BUILDKITE_BRANCH gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker tag eosio/eos-dev:$BUILDKITE_TAG gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_TAG || : && \
-        docker tag eosio/eos-dev:latest gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
-        echo "PUSHING DOCKER IMAGES" && \
-        docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
-        docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker push gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_TAG || : && \
-        docker push gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
-        echo "TRASHING OLD IMAGES" && \
-        docker rmi eosio/eos-dev:$BUILDKITE_COMMIT && \
-        docker rmi eosio/eos-dev:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi eosio/eos-dev:$BUILDKITE_TAG || : && \
-        docker rmi eosio/eos-dev:latest && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_COMMIT && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_BRANCH && \
-        [[ "$BUILDKITE_TAG" != "" ]] && docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:$BUILDKITE_TAG || : && \
-        docker rmi gcr.io/b1-automation-dev/eosio/eos-dev:latest && \
-        docker rmi gcr.io/b1-automation-dev/eosio/builder:$BUILDKITE_COMMIT
-    label: "Docker build eos-dev"
-    agents:
-      queue: "automation-docker-builder-fleet"
-    timeout: 300
-
-  - wait
diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
index 0e6133019ce..6383f57c392 100644
--- a/.buildkite/long_running_tests.yml
+++ b/.buildkite/long_running_tests.yml
@@ -1,9 +1,9 @@
 steps:
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 16.04 Build"
     agents:
@@ -22,9 +22,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 18.04 Build"
     agents:
@@ -43,9 +43,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":centos: 7 Build"
     agents:
@@ -64,9 +64,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":aws: 1 Build"
     agents:
@@ -85,9 +85,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":aws: 2 Build"
     agents:
@@ -106,9 +106,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":fedora: 27 Build"
     agents:
@@ -127,11 +127,11 @@ steps:
     timeout: 60
 
   - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:" && \
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
-      echo "+++ Building :hammer:" && \
-      ./scripts/eosio_build.sh -y && \
-      echo "--- Compressing build directory :compression:" && \
+      echo "--- Creating symbolic link to job directory :file_folder:"
+      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
+      echo "+++ Building :hammer:"
+      ./scripts/eosio_build.sh -y
+      echo "--- Compressing build directory :compression:"
       tar -pczf build.tar.gz build/
     label: ":darwin: Mojave Build"
     agents:
@@ -141,11 +141,11 @@ steps:
     timeout: 60
 
   - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:" && \
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
-      echo "+++ Building :hammer:" && \
-      ./scripts/eosio_build.sh -y && \
-      echo "--- Compressing build directory :compression:" && \
+      echo "--- Creating symbolic link to job directory :file_folder:"
+      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
+      echo "+++ Building :hammer:"
+      ./scripts/eosio_build.sh -y
+      echo "--- Compressing build directory :compression:"
       tar -pczf build.tar.gz build/
     label: ":darwin: High Sierra Build"
     agents:
@@ -156,21 +156,14 @@ steps:
 
   - wait
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Ubuntu 16.04 Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":ubuntu: 16.04 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -181,23 +174,16 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu16_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
   
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Ubuntu 18.04 Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":ubuntu: 18.04 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -208,23 +194,16 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # centOS Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":centos: 7 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -235,23 +214,16 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:centos7_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Amazon AWS-1 Linux Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":aws: 1 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -262,23 +234,16 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux1_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Amazon AWS-2 Linux Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":aws: 2 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -289,23 +254,16 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:amazonlinux2_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Fedora Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
+        echo "+++ :microscope: Running LR Tests"
+        ./scripts/long-running-test.sh
     label: ":fedora: 27 LR Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -316,42 +274,26 @@ steps:
         debug: true
         image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:fedora27_2-1"
         workdir: /data/job
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # High Sierra Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
+        echo "+++ :microscope: Running LR Tests"
+        ln -s "$(pwd)" /data/job && ./scripts/long-running-test.sh
     label: ":darwin: High Sierra LR Tests"
     agents:
       - "role=tester-v2-1"
       - "os=high-sierra"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    timeout: 60
+    timeout: 90
 
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running LR Tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L long_running_tests --output-on-failure
+  - command: | # Mojave Tests
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
+        echo "+++ :microscope: Running LR Tests"
+        ln -s "$(pwd)" /data/job && ./scripts/long-running-test.sh
     label: ":darwin: Mojave LR Tests"
     agents:
       - "role=tester-v2-1"
       - "os=mojave"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
-    timeout: 60
-
-  
\ No newline at end of file
+    timeout: 90
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4e860734910..57ce31e5a6c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,9 +1,9 @@
 steps:
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 16.04 Build"
     agents:
@@ -22,9 +22,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":ubuntu: 18.04 Build"
     agents:
@@ -43,9 +43,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":centos: 7 Build"
     agents:
@@ -64,9 +64,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":aws: 1 Build"
     agents:
@@ -85,9 +85,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":aws: 2 Build"
     agents:
@@ -106,9 +106,9 @@ steps:
     timeout: 60
 
   - command: |
-        echo "+++ :hammer: Building" && \
-        ./scripts/eosio_build.sh -y && \
-        echo "--- :compression: Compressing build directory" && \
+        echo "+++ :hammer: Building"
+        ./scripts/eosio_build.sh -y
+        echo "--- :compression: Compressing build directory"
         tar -pczf build.tar.gz build/
     label: ":fedora: 27 Build"
     agents:
@@ -127,11 +127,11 @@ steps:
     timeout: 60
 
   - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:" && \
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
-      echo "+++ Building :hammer:" && \
-      ./scripts/eosio_build.sh -y && \
-      echo "--- Compressing build directory :compression:" && \
+      echo "--- Creating symbolic link to job directory :file_folder:"
+      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
+      echo "+++ Building :hammer:"
+      ./scripts/eosio_build.sh -y
+      echo "--- Compressing build directory :compression:"
       tar -pczf build.tar.gz build/
     label: ":darwin: Mojave Build"
     agents:
@@ -141,11 +141,11 @@ steps:
     timeout: 60
 
   - command: |
-      echo "--- Creating symbolic link to job directory :file_folder:" && \
-      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job && \
-      echo "+++ Building :hammer:" && \
-      ./scripts/eosio_build.sh -y && \
-      echo "--- Compressing build directory :compression:" && \
+      echo "--- Creating symbolic link to job directory :file_folder:"
+      sleep 5 && ln -s "$(pwd)" /data/job && cd /data/job
+      echo "+++ Building :hammer:"
+      ./scripts/eosio_build.sh -y
+      echo "--- Compressing build directory :compression:"
       tar -pczf build.tar.gz build/
     label: ":darwin: High Sierra Build"
     agents:
@@ -156,21 +156,15 @@ steps:
 
   - wait
 
+  # Ubuntu 16.04 Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":ubuntu: 16.04 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -184,20 +178,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":ubuntu: 16.04 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -210,21 +197,15 @@ steps:
         workdir: /data/job
     timeout: 60
   
+  # Ubuntu 18.04 Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":ubuntu: 18.04 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -238,20 +219,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":ubuntu: 18.04 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -264,22 +238,15 @@ steps:
         workdir: /data/job
     timeout: 60
 
-
+  # centOS Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":centos: 7 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -293,20 +260,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":centos: 7 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -319,21 +279,15 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  # Amazon AWS-1 Linux Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":aws: 1 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -347,20 +301,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 1 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":aws: 1 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -373,21 +320,15 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  # Amazon AWS-2 Linux Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":aws: 2 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -401,20 +342,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: 2 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":aws: 2 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -427,21 +361,15 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  # Fedora Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/parallel-test.sh
     label: ":fedora: 27 Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -455,20 +383,13 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
+        echo "+++ :microscope: Running Tests"
+        ./scripts/serial-test.sh
     label: ":fedora: 27 NP Tests"
     agents:
       queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     plugins:
       ecr#v1.1.4:
         login: true
@@ -481,85 +402,61 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  # High Sierra Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
+        echo "+++ :microscope: Running Tests"
+        ln -s "$(pwd)" /data/job
+        ./scripts/parallel-test.sh
     label: ":darwin: High Sierra Tests"
     agents:
       - "role=tester-v2-1"
       - "os=high-sierra"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
+        echo "+++ :microscope: Running Tests"
+        ln -s "$(pwd)" /data/job && ./scripts/serial-test.sh
     label: ":darwin: High Sierra NP Tests"
     agents:
       - "role=tester-v2-1"
       - "os=high-sierra"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     timeout: 60
 
+  # Mojave Tests
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -j8 -LE _tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
+        echo "+++ :microscope: Running Tests"
+        ln -s "$(pwd)" /data/job
+        ./scripts/parallel-test.sh
     label: ":darwin: Mojave Tests"
     agents:
       - "role=tester-v2-1"
       - "os=mojave"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build" && \
-        tar -zxf build.tar.gz && \
-        echo "--- :m: Starting MongoDB" && \
-        ~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && PATH=\$PATH:~/opt/mongodb/bin ctest -L nonparallelizable_tests --output-on-failure
+        echo "--- :arrow_down: Downloading Build Directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
+        echo "+++ :microscope: Running Tests"
+        ln -s "$(pwd)" /data/job && ./scripts/serial-test.sh
     label: ":darwin: Mojave NP Tests"
     agents:
       - "role=tester-v2-1"
       - "os=mojave"
-    artifact_paths:
-      - "mongod.log"
-      - "build/genesis.json"
-      - "build/config.ini"
     timeout: 60
     
   - wait
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: High Sierra Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
         ln -s "$(pwd)" /data/job && cd /data/job/build/packages && bash generate_package.sh brew
     label: ":darwin: High Sierra Package Builder"
     agents:
@@ -571,10 +468,10 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Mojave Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
         ln -s "$(pwd)" /data/job && cd /data/job/build/packages && bash generate_package.sh brew
     label: ":darwin: Mojave Package Builder"
     agents:
@@ -586,10 +483,10 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 16.04 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
         cd /data/job/build/packages && bash generate_package.sh deb
     label: ":ubuntu: 16.04 Package builder"
     agents:
@@ -612,10 +509,10 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
         cd /data/job/build/packages && bash generate_package.sh deb
     label: ":ubuntu: 18.04 Package builder"
     agents:
@@ -638,17 +535,17 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
-        yum install -y rpm-build && \
-        mkdir -p /root/rpmbuild/BUILD && \
-        mkdir -p /root/rpmbuild/BUILDROOT && \
-        mkdir -p /root/rpmbuild/RPMS && \
-        mkdir -p /root/rpmbuild/SOURCES && \
-        mkdir -p /root/rpmbuild/SPECS && \
-        mkdir -p /root/rpmbuild/SRPMS && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: 27 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
+        yum install -y rpm-build
+        mkdir -p /root/rpmbuild/BUILD
+        mkdir -p /root/rpmbuild/BUILDROOT
+        mkdir -p /root/rpmbuild/RPMS
+        mkdir -p /root/rpmbuild/SOURCES
+        mkdir -p /root/rpmbuild/SPECS
+        mkdir -p /root/rpmbuild/SRPMS
         cd /data/job/build/packages && bash generate_package.sh rpm
     label: ":fedora: 27 Package builder"
     agents:
@@ -671,17 +568,17 @@ steps:
     timeout: 60
 
   - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build" && \
-        tar -zxf build.tar.gz && \
-        echo "+++ :microscope: Starting package build" && \
-        yum install -y rpm-build && \
-        mkdir -p /root/rpmbuild/BUILD && \
-        mkdir -p /root/rpmbuild/BUILDROOT && \
-        mkdir -p /root/rpmbuild/RPMS && \
-        mkdir -p /root/rpmbuild/SOURCES && \
-        mkdir -p /root/rpmbuild/SPECS && \
-        mkdir -p /root/rpmbuild/SRPMS && \
+        echo "--- :arrow_down: Downloading build directory"
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: 7 Build"
+        tar -zxf build.tar.gz
+        echo "+++ :microscope: Starting package build"
+        yum install -y rpm-build
+        mkdir -p /root/rpmbuild/BUILD
+        mkdir -p /root/rpmbuild/BUILDROOT
+        mkdir -p /root/rpmbuild/RPMS
+        mkdir -p /root/rpmbuild/SOURCES
+        mkdir -p /root/rpmbuild/SPECS
+        mkdir -p /root/rpmbuild/SRPMS
         cd /data/job/build/packages && bash generate_package.sh rpm
     label: ":centos: 7 Package builder"
     agents:
@@ -706,9 +603,9 @@ steps:
   - wait
 
   - command: |
-        echo "--- :arrow_down: Downloading brew files" && \
-        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: High Sierra Package Builder" && \
-        mv build/packages/eosio.rb build/packages/eosio_highsierra.rb && \
+        echo "--- :arrow_down: Downloading brew files"
+        buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: High Sierra Package Builder"
+        mv build/packages/eosio.rb build/packages/eosio_highsierra.rb
         buildkite-agent artifact download "build/packages/eosio.rb" . --step ":darwin: Mojave Package Builder"
     label: ":darwin: Brew Updater"
     agents:
@@ -716,4 +613,4 @@ steps:
     artifact_paths:
       - "build/packages/eosio_highsierra.rb"
       - "build/packages/eosio.rb"
-    timeout: 60
\ No newline at end of file
+    timeout: 60
diff --git a/.buildkite/sanitizers.yml b/.buildkite/sanitizers.yml
deleted file mode 100644
index d49493eb5ee..00000000000
--- a/.buildkite/sanitizers.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-steps:
-  - command: |
-        echo "--- :hammer: Building with Undefined Sanitizer" && \
-        /usr/bin/cmake -GNinja \
-        -DCMAKE_BUILD_TYPE=Debug \
-        -DCMAKE_CXX_COMPILER=clang++-4.0 \
-        -DCMAKE_C_COMPILER=clang-4.0 \
-        -DBOOST_ROOT="${BOOST_ROOT}" \
-        -DWASM_ROOT="${WASM_ROOT}" \
-        -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
-        -DBUILD_MONGO_DB_PLUGIN=true \
-        -DENABLE_COVERAGE_TESTING=true\
-        -DBUILD_DOXYGEN=false -DCMAKE_CXX_FLAGS="-fsanitize=undefined -fsanitize-recover=all -g -fno-omit-frame-pointer" \
-        -DCMAKE_C_FLAGS="-fsanitize=undefined -fsanitize-recover=all -g -fno-omit-frame-pointer" \
-        -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=undefined -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s -pthread" \
-        -DCMAKE_MODULE_LINKER_FLAGS="-fsanitize=undefined -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s -pthread" && \
-        echo "--- :shinto_shrine: Running ninja" && \
-        /usr/bin/ninja | tee ninja.log && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz *
-        echo "--- :beers: Done"
-    label: ":_: Undefined Sanitizer"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build.tar.gz"
-      - "ninja.log"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-        command: ["--privileged"]
-        mounts:
-          - /etc/buildkite-agent/config:/config
-        environment:
-          - BOOST_ROOT=/root/opt/boost
-          - OPENSSL_ROOT_DIR=/usr/include/openssl
-          - WASM_ROOT=/root/opt/wasm
-          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin
-          - CI=true
-          - UBSAN_OPTIONS=print_stacktrace=1
-    timeout: 60
-
-  - command: |
-        echo "--- :hammer: Building with Address Sanitizer" && \
-        /usr/bin/cmake -GNinja \
-        -DCMAKE_BUILD_TYPE=Debug \
-        -DCMAKE_CXX_COMPILER=clang++-4.0 \
-        -DCMAKE_C_COMPILER=clang-4.0 \
-        -DBOOST_ROOT="${BOOST_ROOT}" \
-        -DWASM_ROOT="${WASM_ROOT}" \
-        -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
-        -DBUILD_MONGO_DB_PLUGIN=true \
-        -DENABLE_COVERAGE_TESTING=true \
-        -DBUILD_DOXYGEN=false \
-        -DCMAKE_CXX_FLAGS="-fsanitize=address -fsanitize-recover=all -O1 -g -fno-omit-frame-pointer" \
-        -DCMAKE_C_FLAGS="-fsanitize=address -fsanitize-recover=all -O1 -g -fno-omit-frame-pointer" \
-        -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=address -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s" \
-        -DCMAKE_MODULE_LINKER_FLAGS="-fsanitize=address -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s"
-        echo "--- :shinto_shrine: Running ninja" && \
-        /usr/bin/ninja | tee ninja.log && \
-        echo "--- :compression: Compressing build directory" && \
-        tar -pczf build.tar.gz *
-        echo "--- :beers: Done"
-    label: ":_: Address Sanitizer"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "build.tar.gz"
-      - "ninja.log"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-        command: ["--privileged"]
-        mounts:
-          - /etc/buildkite-agent/config:/config
-        environment:
-          - BOOST_ROOT=/root/opt/boost
-          - OPENSSL_ROOT_DIR=/usr/include/openssl
-          - WASM_ROOT=/root/opt/wasm
-          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin
-          - CI=true
-          - ASAN_OPTIONS=fast_unwind_on_malloc=0:halt_on_error=0:detect_odr_violation=0:detect_leaks=0:symbolize=1:verbosity=1
-    timeout: 60
-
-  - wait
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":_: Undefined Sanitizer" && \
-        tar -zxf build.tar.gz --no-same-owner && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ctest -j8 -LE _tests -V -O sanitizer.log || true
-    label: ":_: Undefined Sanitizer Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "sanitizer.log"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-        mounts:
-          - /etc/buildkite-agent/config:/config
-    timeout: 120
-
-  - command: |
-        echo "--- :arrow_down: Downloading build directory" && \
-        buildkite-agent artifact download "build.tar.gz" . --step ":_: Address Sanitizer" && \
-        tar -zxf build.tar.gz --no-same-owner && \
-        echo "--- :m: Starting MongoDB" && \
-        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
-        echo "+++ :microscope: Running tests" && \
-        ctest -j8 -LE _tests -V -O sanitizer.log || true
-    label: ":_: Address Sanitizer Tests"
-    agents:
-      queue: "automation-large-builder-fleet"
-    artifact_paths:
-      - "mongod.log"
-      - "sanitizer.log"
-    plugins:
-      ecr#v1.1.4:
-        login: true
-        account_ids: "436617320021"
-        no-include-email: true
-        region: "us-west-2"
-      docker#v2.1.0:
-        debug: true
-        image: "436617320021.dkr.ecr.us-west-2.amazonaws.com/ci:ubuntu18_2-1"
-        workdir: /data/job
-        mounts:
-          - /etc/buildkite-agent/config:/config
-    timeout: 120
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d54f35526c..f9375f0f8b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.5 )
 
 project( EOSIO )
-
+include(CTest) # suppresses DartConfiguration.tcl error
 enable_testing()
 
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
diff --git a/scripts/long-running-test.sh b/scripts/long-running-test.sh
new file mode 100755
index 00000000000..60cae2d0b7f
--- /dev/null
+++ b/scripts/long-running-test.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
+# prepare environment
+PATH=$PATH:~/opt/mongodb/bin
+echo "Extracting build directory..."
+tar -zxf build.tar.gz
+echo "Starting MongoDB..."
+~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log
+cd /data/job/build
+# run tests
+echo "Running tests..."
+TEST_COUNT=$(ctest -N -L nonparallelizable_tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+echo "$ ctest -L long_running_tests --output-on-failure -T Test"
+ctest -L long_running_tests --output-on-failure -T Test
+# upload artifacts
+echo "Uploading artifacts..."
+XML_FILENAME="test-results.xml"
+mv $(pwd)/Testing/$(ls $(pwd)/Testing/ | grep '20' | tail -n 1)/Test.xml $XML_FILENAME
+buildkite-agent artifact upload config.ini
+buildkite-agent artifact upload genesis.json
+cd ..
+buildkite-agent artifact upload mongod.log
+cd build
+buildkite-agent artifact upload $XML_FILENAME
+echo "Done uploading artifacts."
diff --git a/scripts/parallel-test.sh b/scripts/parallel-test.sh
new file mode 100755
index 00000000000..5174c454e2a
--- /dev/null
+++ b/scripts/parallel-test.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
+# prepare environment
+PATH=$PATH:~/opt/mongodb/bin
+echo "Extracting build directory..."
+tar -zxf build.tar.gz
+echo "Starting MongoDB..."
+~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log
+cd /data/job/build
+# run tests
+echo "Running tests..."
+CPU_CORES=$(getconf _NPROCESSORS_ONLN)
+echo "$CPU_CORES cpu cores detected."
+TEST_COUNT=$(ctest -N -LE _tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+echo "$ ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test"
+ctest -j $CPU_CORES -LE _tests --output-on-failure -T Test
+# upload artifacts
+echo "Uploading artifacts..."
+XML_FILENAME="test-results.xml"
+mv $(pwd)/Testing/$(ls $(pwd)/Testing/ | grep '20' | tail -n 1)/Test.xml $XML_FILENAME
+buildkite-agent artifact upload config.ini
+buildkite-agent artifact upload genesis.json
+cd ..
+buildkite-agent artifact upload mongod.log
+cd build
+buildkite-agent artifact upload $XML_FILENAME
+echo "Done uploading artifacts."
diff --git a/scripts/serial-test.sh b/scripts/serial-test.sh
new file mode 100755
index 00000000000..512229d6272
--- /dev/null
+++ b/scripts/serial-test.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e # exit on failure of any "simple" command (excludes &&, ||, or | chains)
+# prepare environment
+PATH=$PATH:~/opt/mongodb/bin
+echo "Extracting build directory..."
+tar -zxf build.tar.gz
+echo "Starting MongoDB..."
+~/bin/mongod --fork --dbpath ~/data/mongodb -f ~/etc/mongod.conf --logpath "$(pwd)"/mongod.log
+cd /data/job/build
+# run tests
+echo "Running tests..."
+TEST_COUNT=$(ctest -N -L nonparallelizable_tests | grep -i 'Total Tests: ' | cut -d ':' -f 2 | awk '{print $1}')
+[[ $TEST_COUNT > 0 ]] && echo "$TEST_COUNT tests found." || (echo "ERROR: No tests registered with ctest! Exiting..." && exit 1)
+echo "$ ctest -L nonparallelizable_tests --output-on-failure -T Test"
+ctest -L nonparallelizable_tests --output-on-failure -T Test
+# upload artifacts
+echo "Uploading artifacts..."
+XML_FILENAME="test-results.xml"
+mv $(pwd)/Testing/$(ls $(pwd)/Testing/ | grep '20' | tail -n 1)/Test.xml $XML_FILENAME
+buildkite-agent artifact upload config.ini
+buildkite-agent artifact upload genesis.json
+cd ..
+buildkite-agent artifact upload mongod.log
+cd build
+buildkite-agent artifact upload $XML_FILENAME
+echo "Done uploading artifacts."