diff --git a/.evergreen/atlas/setup-atlas-cluster.sh b/.evergreen/atlas/setup-atlas-cluster.sh
index c57437bc..3fd2fe2e 100755
--- a/.evergreen/atlas/setup-atlas-cluster.sh
+++ b/.evergreen/atlas/setup-atlas-cluster.sh
@@ -18,14 +18,24 @@ set -o errexit  # Exit the script with error if any of the commands fail
 # CREATE_CLUSTER_JSON: The JSON used to create a cluster via the Atlas API.
 # ATLAS_BASE_URL: Where the Atlas API root resides.
 
-# The Atlas API version
-ATLAS_API_VERSION="v1.0"
-# The base Atlas API url. We use the API directly as the CLI does not yet
-# support testing cluster outages.
-ATLAS_BASE_URL="https://cloud.mongodb.com/api/atlas/$ATLAS_API_VERSION"
+VARLIST=(
+DRIVERS_ATLAS_PUBLIC_API_KEY
+DRIVERS_ATLAS_PRIVATE_API_KEY
+DRIVERS_ATLAS_GROUP_ID
+DRIVERS_ATLAS_LAMBDA_USER
+DRIVERS_ATLAS_LAMBDA_PASSWORD
+LAMBDA_STACK_NAME
+)
+
+# Ensure that all variables required to run the test are set, otherwise throw
+# an error.
+for VARNAME in ${VARLIST[*]}; do
+[[ -z "${!VARNAME}" ]] && echo "ERROR: $VARNAME not set" && exit 1;
+done
 
-# Add git commit to name of function and cluster.
-FUNCTION_NAME="${LAMBDA_STACK_NAME}-$(git rev-parse --short HEAD)"
+# Set up the common variables.
+DIR="$(dirname "${BASH_SOURCE[0]}")"
+. $DIR/setup-variables.sh
 
 # The cluster server version.
 VERSION="${MONGODB_VERSION:-6.0}"
diff --git a/.evergreen/atlas/setup-variables.sh b/.evergreen/atlas/setup-variables.sh
new file mode 100644
index 00000000..c4daeee7
--- /dev/null
+++ b/.evergreen/atlas/setup-variables.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Explanation of required environment variables:
+#
+# LAMBDA_STACK_NAME: The name of the stack on lambda "dbx-<language>-lambda"
+
+# Explanation of generated variables:
+#
+# FUNCTION_NAME: Uses the stack name plus the current commit sha to create a unique cluster and function.
+# ATLAS_BASE_URL: Where the Atlas API root resides.
+
+
+# The Atlas API version
+ATLAS_API_VERSION="v1.0"
+# The base Atlas API url. We use the API directly as the CLI does not yet
+# support testing cluster outages.
+ATLAS_BASE_URL="https://cloud.mongodb.com/api/atlas/$ATLAS_API_VERSION"
+
+# Add git commit to name of function and cluster.
+FUNCTION_NAME="${LAMBDA_STACK_NAME}-$(git rev-parse --short HEAD)"
\ No newline at end of file
diff --git a/.evergreen/atlas/teardown-atlas-cluster.sh b/.evergreen/atlas/teardown-atlas-cluster.sh
index 145c19f7..0d0d7c2c 100755
--- a/.evergreen/atlas/teardown-atlas-cluster.sh
+++ b/.evergreen/atlas/teardown-atlas-cluster.sh
@@ -13,14 +13,22 @@ set -o errexit  # Exit the script with error if any of the commands fail
 # FUNCTION_NAME: Uses the stack name plus the current commit sha to create a unique cluster and function.
 # ATLAS_BASE_URL: Where the Atlas API root resides.
 
-# The Atlas API version
-ATLAS_API_VERSION="v1.0"
-# The base Atlas API url. We use the API directly as the CLI does not yet
-# support testing cluster outages.
-ATLAS_BASE_URL="https://cloud.mongodb.com/api/atlas/$ATLAS_API_VERSION"
+VARLIST=(
+DRIVERS_ATLAS_PUBLIC_API_KEY
+DRIVERS_ATLAS_PRIVATE_API_KEY
+DRIVERS_ATLAS_GROUP_ID
+LAMBDA_STACK_NAME
+)
 
-# Add git commit to name of function and cluster.
-FUNCTION_NAME="${LAMBDA_STACK_NAME}-$(git rev-parse --short HEAD)"
+# Ensure that all variables required to run the test are set, otherwise throw
+# an error.
+for VARNAME in ${VARLIST[*]}; do
+[[ -z "${!VARNAME}" ]] && echo "ERROR: $VARNAME not set" && exit 1;
+done
+
+# Set up the common variables.
+DIR="$(dirname "${BASH_SOURCE[0]}")"
+. $DIR/setup-variables.sh
 
 # Delete the cluster.
 echo "Deleting Atlas Cluster..."
diff --git a/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh b/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
index 748f3b54..32db2c95 100755
--- a/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
+++ b/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
@@ -6,23 +6,32 @@ set -o errexit  # Exit the script with error if any of the commands fail
 # TEST_LAMBDA_DIRECTORY: The root of the project's Lambda sam project.
 # DRIVERS_ATLAS_PUBLIC_API_KEY: The public Atlas key for the drivers org.
 # DRIVERS_ATLAS_PRIVATE_API_KEY: The private Atlas key for the drivers org.
+# DRIVERS_ATLAS_LAMBDA_USER: The user for the lambda cluster.
+# DRIVERS_ATLAS_LAMBDA_PASSWORD: The password for the user.
 # DRIVERS_ATLAS_GROUP_ID: The id of the individual projects under the drivers org, per language.
 # LAMBDA_STACK_NAME: The name of the stack on lambda "dbx-<language>-lambda"
 # AWS_REGION: The region for the function - generally us-east-1
-# MONGODB_URI: The URI of the Atlas cluster to test against.
 
-# Explanation of generated variables:
-#
-# FUNCTION_NAME: Uses the stack name plus the current commit sha to create a unique cluster and function.
-# CREATE_CLUSTER_JSON: The JSON used to create a cluster via the Atlas API.
-# ATLAS_BASE_URL: Where the Atlas API root resides.
-
-# The base Atlas API url. We use the API directly as the CLI does not yet
-# support testing cluster outages.
-ATLAS_BASE_URL="https://cloud.mongodb.com/api/atlas/v1.0"
-
-# Add git commit to name of function and cluster.
-FUNCTION_NAME="${LAMBDA_STACK_NAME}-$(git rev-parse --short HEAD)"
+VARLIST=(
+TEST_LAMBDA_DIRECTORY
+DRIVERS_ATLAS_PUBLIC_API_KEY
+DRIVERS_ATLAS_PRIVATE_API_KEY
+DRIVERS_ATLAS_LAMBDA_USER
+DRIVERS_ATLAS_LAMBDA_PASSWORD
+DRIVERS_ATLAS_GROUP_ID
+LAMBDA_STACK_NAME
+AWS_REGION
+)
+
+# Ensure that all variables required to run the test are set, otherwise throw
+# an error.
+for VARNAME in ${VARLIST[*]}; do
+[[ -z "${!VARNAME}" ]] && echo "ERROR: $VARNAME not set" && exit 1;
+done
+
+# Set up the common variables
+DIR="$(dirname $(dirname "${BASH_SOURCE[0]}"))"
+. $DIR/atlas/setup-variables.sh
 
 # Restarts the cluster's primary node.
 restart_cluster_primary ()
@@ -59,13 +68,19 @@ get_lambda_function_arn ()
   export LAMBDA_FUNCTION_ARN=$LAMBDA_FUNCTION_ARN
 }
 
-# Delete the lambda cloud formation stack.
-delete_lambda_stack ()
+delete_lambda_function ()
 {
-  echo "Deleting Lambda Stack..."
+  echo "Deleting Lambda Function..."
   sam delete --stack-name ${FUNCTION_NAME} --no-prompts --region us-east-1
 }
 
+cleanup ()
+{
+  delete_lambda_function
+}
+
+trap cleanup EXIT SIGHUP
+
 cd "${TEST_LAMBDA_DIRECTORY}"
 
 sam build
@@ -74,19 +89,30 @@ deploy_lambda_function
 
 get_lambda_function_arn
 
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-standard.json
-tail lambda-invoke-standard.json
+
+check_lambda_output () {
+  if grep -q FunctionError output.json
+  then
+      echo "Exiting due to FunctionError!"
+      exit 1
+  fi
+  cat output.json | jq -r '.LogResult' | base64 --decode
+}
+
+aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-standard.json > output.json
+cat lambda-invoke-standard.json
+check_lambda_output
 
 echo "Sleeping 1 minute to build up some streaming protocol heartbeats..."
 sleep 60
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-frozen.json
-tail lambda-invoke-frozen.json
+aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-frozen.json > output.json
+cat lambda-invoke-frozen.json
+check_lambda_output
 
 restart_cluster_primary
 
 echo "Sleeping 1 minute to build up some streaming protocol heartbeats..."
 sleep 60
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-outage.json
-tail lambda-invoke-outage.json
-
-delete_lambda_stack || true
+aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-outage.json > output.json
+cat lambda-invoke-outage.json
+check_lambda_output
diff --git a/.evergreen/run-deployed-lambda-aws-tests.sh b/.evergreen/run-deployed-lambda-aws-tests.sh
deleted file mode 100755
index 57fc2105..00000000
--- a/.evergreen/run-deployed-lambda-aws-tests.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/bash
-set -o errexit  # Exit the script with error if any of the commands fail
-
-# Explanation of required environment variables:
-#
-# TEST_LAMBDA_DIRECTORY: The root of the project's Lambda sam project.
-# DRIVERS_ATLAS_PUBLIC_API_KEY: The public Atlas key for the drivers org.
-# DRIVERS_ATLAS_PRIVATE_API_KEY: The private Atlas key for the drivers org.
-# DRIVERS_ATLAS_LAMBDA_USER: The user for the lambda cluster.
-# DRIVERS_ATLAS_LAMBDA_PASSWORD: The password for the user.
-# DRIVERS_ATLAS_GROUP_ID: The id of the individual projects under the drivers org, per language.
-# LAMBDA_STACK_NAME: The name of the stack on lambda "dbx-<language>-lambda"
-# AWS_REGION: The region for the function - generally us-east-1
-
-# Explanation of generated variables:
-#
-# MONGODB_URI: The URI for the created Atlas cluster during this script.
-# FUNCTION_NAME: Uses the stack name plus the current commit sha to create a unique cluster and function.
-# CREATE_CLUSTER_JSON: The JSON used to create a cluster via the Atlas API.
-# ATLAS_BASE_URL: Where the Atlas API root resides.
-
-# The base Atlas API url. We use the API directly as the CLI does not yet
-# support testing cluster outages.
-ATLAS_BASE_URL="https://cloud.mongodb.com/api/atlas/v1.0"
-
-# Add git commit to name of function and cluster.
-FUNCTION_NAME="${LAMBDA_STACK_NAME}-$(git rev-parse --short HEAD)"
-
-# Set the create cluster configuration.
-CREATE_CLUSTER_JSON=$(cat <<EOF
-{
-  "autoScaling" : {
-    "autoIndexingEnabled" : false,
-    "compute" : {
-      "enabled" : true,
-      "scaleDownEnabled" : true
-    },
-    "diskGBEnabled" : true
-  },
-  "backupEnabled" : false,
-  "biConnector" : {
-    "enabled" : false,
-    "readPreference" : "secondary"
-  },
-  "clusterType" : "REPLICASET",
-  "diskSizeGB" : 10.0,
-  "encryptionAtRestProvider" : "NONE",
-  "mongoDBMajorVersion" : "6.0",
-  "mongoDBVersion" : "6.0.4",
-  "name" : "${FUNCTION_NAME}",
-  "numShards" : 1,
-  "paused" : false,
-  "pitEnabled" : false,
-  "providerBackupEnabled" : false,
-  "providerSettings" : {
-    "providerName" : "AWS",
-    "autoScaling" : {
-      "compute" : {
-        "maxInstanceSize" : "M20",
-        "minInstanceSize" : "M10"
-      }
-    },
-    "diskIOPS" : 3000,
-    "encryptEBSVolume" : true,
-    "instanceSizeName" : "M10",
-    "regionName" : "US_EAST_1",
-    "volumeType" : "STANDARD"
-  },
-  "replicationFactor" : 3,
-  "rootCertType" : "ISRGROOTX1",
-  "terminationProtectionEnabled" : false,
-  "versionReleaseSystem" : "LTS"
-}
-EOF
-)
-
-# Create an Atlas M10 cluster - this returns immediately so we'll need to poll until
-# the cluster is created.
-create_cluster ()
-{
-  echo "Creating new Atlas Cluster..."
-  curl \
-    --digest -u "${DRIVERS_ATLAS_PUBLIC_API_KEY}:${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-    -d "${CREATE_CLUSTER_JSON}" \
-    -H 'Content-Type: application/json' \
-    -X POST \
-    "${ATLAS_BASE_URL}/groups/${DRIVERS_ATLAS_GROUP_ID}/clusters?pretty=true"
-}
-
-# Delete the cluster.
-delete_cluster ()
-{
-  echo "Deleting Atlas Cluster..."
-  curl \
-    --digest -u ${DRIVERS_ATLAS_PUBLIC_API_KEY}:${DRIVERS_ATLAS_PRIVATE_API_KEY} \
-    -X DELETE \
-    "${ATLAS_BASE_URL}/groups/${DRIVERS_ATLAS_GROUP_ID}/clusters/${FUNCTION_NAME}?pretty=true"
-}
-
-# Check is cluster has a srv address, and assume once it does, it can be used.
-check_cluster ()
-{
-  count=0
-  SRV_ADDRESS="null"
-  # Don't try longer than 15 minutes.
-  while [ $SRV_ADDRESS = "null" ] && [ $count -le 30 ]; do
-    echo "Checking every 30 seconds for cluster to be created..."
-    # Poll every 30 seconds to check the cluster creation.
-    sleep 30
-    SRV_ADDRESS=$(curl \
-      --digest -u "${DRIVERS_ATLAS_PUBLIC_API_KEY}:${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
-      -X GET \
-      "${ATLAS_BASE_URL}/groups/${DRIVERS_ATLAS_GROUP_ID}/clusters/${FUNCTION_NAME}" \
-      | jq -r '.srvAddress'
-    );
-    count=$(( $count + 1 ))
-    echo $SRV_ADDRESS
-  done
-
-  if [ $SRV_ADDRESS = "null" ]; then
-    echo "No cluster could be created in the 15 minute timeframe or error occured. Deleting potential cluster."
-    delete_cluster
-    exit 1
-  else
-    echo "Setting MONGODB_URI in the environment to the new cluster"
-    # else set the mongodb uri
-    URI=$(echo $SRV_ADDRESS | grep -Eo "[^(\/\/)]*$" | cat)
-    MONGODB_URI="mongodb+srv://${DRIVERS_ATLAS_LAMBDA_USER}:${DRIVERS_ATLAS_LAMBDA_PASSWORD}@${URI}"
-    export MONGODB_URI=$MONGODB_URI
-  fi
-}
-
-# Restarts the cluster's primary node.
-restart_cluster_primary ()
-{
-  echo "Testing Atlas primary restart..."
-  curl \
-    --digest -u ${DRIVERS_ATLAS_PUBLIC_API_KEY}:${DRIVERS_ATLAS_PRIVATE_API_KEY} \
-    -X POST \
-    "${ATLAS_BASE_URL}/groups/${DRIVERS_ATLAS_GROUP_ID}/clusters/${FUNCTION_NAME}/restartPrimaries"
-}
-
-# Deploys a lambda function to the set stack name.
-deploy_lambda_function ()
-{
-  echo "Deploying Lambda function..."
-  sam deploy \
-    --stack-name "${FUNCTION_NAME}" \
-    --capabilities CAPABILITY_IAM \
-    --resolve-s3 \
-    --parameter-overrides "MongoDbUri=${MONGODB_URI}" \
-    --region ${AWS_REGION}
-}
-
-# Get the ARN for the Lambda function we created and export it.
-get_lambda_function_arn ()
-{
-  echo "Getting Lambda function ARN..."
-  LAMBDA_FUNCTION_ARN=$(sam list stack-outputs \
-    --stack-name ${FUNCTION_NAME} \
-    --region ${AWS_REGION} \
-    --output json | jq '.[] | select(.OutputKey == "MongoDBFunction") | .OutputValue' | tr -d '"'
-  )
-  echo "Lambda function ARN: $LAMBDA_FUNCTION_ARN"
-  export LAMBDA_FUNCTION_ARN=$LAMBDA_FUNCTION_ARN
-}
-
-delete_lambda_function ()
-{
-  echo "Deleting Lambda Function..."
-  sam delete --stack-name ${FUNCTION_NAME} --no-prompts --region us-east-1
-}
-
-cleanup ()
-{
-  delete_cluster
-
-  delete_lambda_function
-}
-
-trap cleanup EXIT SIGHUP
-
-cd "${TEST_LAMBDA_DIRECTORY}"
-
-create_cluster
-
-check_cluster
-
-sam build
-
-deploy_lambda_function
-
-get_lambda_function_arn
-
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-standard.json
-tail lambda-invoke-standard.json
-
-echo "Sleeping 1 minute to build up some streaming protocol heartbeats..."
-sleep 60
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-frozen.json
-tail lambda-invoke-frozen.json
-
-restart_cluster_primary
-
-echo "Sleeping 1 minute to build up some streaming protocol heartbeats..."
-sleep 60
-aws lambda invoke --function-name ${LAMBDA_FUNCTION_ARN} --log-type Tail lambda-invoke-outage.json
-tail lambda-invoke-outage.json
diff --git a/.gitignore b/.gitignore
index b01d2142..814d25b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,5 +106,6 @@ lb-expansion.yml
 .DS_Store
 *.log
 orchestration.config
+atlas-expansion.yml
 secrets-expansion.yml
 secrets-export.sh