diff --git a/.env-tests b/.env-tests
index ee088ef..45d349f 100644
--- a/.env-tests
+++ b/.env-tests
@@ -1,10 +1,10 @@
 AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_ACL=None
 AWS_ENABLED=False
 AWS_LOCATION=effect/static
 AWS_S3_CUSTOM_DOMAIN=cdn.clinicedc.org
 AWS_S3_ENDPOINT_URL=https://ams3.digitaloceanspaces.com
-AWS_SECRET_ACCESS_KEY=
 AWS_STORAGE_BUCKET_NAME=
 CDN_ENABLED=False
 CDN_ZONE_URL=
@@ -13,7 +13,7 @@ CELERY_BROKER_PASSWORD=
 CELERY_BROKER_HOST=mq.clinicedc.org
 CELERY_BROKER_PORT=5672
 CELERY_ENABLED=False
-DATA_MANAGER_ENABLED=False
+DATA_MANAGER_ENABLED=True
 DATA_MANAGER_SHOW_ON_DASHBOARD=True
 DATABASE_URL=mysql://root@localhost:3306/effect
 DATABASE_SQLITE_ENABLED=False
@@ -27,11 +27,11 @@ DJANGO_COLLECT_OFFLINE_FILES_USER=
 DJANGO_COLLECT_OFFLINE_SERVER_IP=
 DJANGO_CSRF_COOKIE_SECURE=False
 DJANGO_CUPS_SERVERS=localhost=None
-DJANGO_DASHBOARD_BASE_TEMPLATES=edc_base_template=edc_dashboard/base.html,listboard_base_template=effect_edc/base.html,dashboard_base_template=effect_edc/base.html,screening_listboard_template=effect_dashboard/screening/listboard.html,subject_listboard_template=effect_dashboard/subject/listboard.html,subject_dashboard_template=effect_dashboard/subject/dashboard.html,subject_review_listboard_template=edc_review_dashboard/subject_review_listboard.html,ae_listboard_template=effect_dashboard/ae/ae_listboard.html,death_report_listboard_template=effect_dashboard/ae/death_report_listboard.html
+DJANGO_DASHBOARD_BASE_TEMPLATES=edc_base_template=edc_dashboard/base.html,listboard_base_template=effect_edc/base.html,dashboard_base_template=effect_edc/base.html,screening_listboard_template=effect_dashboard/screening/listboard.html,subject_listboard_template=effect_dashboard/subject/listboard.html,subject_dashboard_template=effect_dashboard/subject/dashboard.html,subject_review_listboard_template=edc_review_dashboard/subject_review_listboard.html
 DJANGO_DASHBOARD_URL_NAMES=
 DJANGO_DEBUG=True
 DJANGO_EDC_BOOTSTRAP=3
-DJANGO_EMAIL_CONTACTS=ae_reports=effectsaereports@witshealth.co.za,data_request=data-request@mg.clinicedc.org,data_manager=data-manager@mg.clinicedc.org
+DJANGO_EMAIL_CONTACTS=ae_reports=effectsaereports@witshealth.co.za,data_request=test-data-request@mg.clinicedc.org,data_manager=data-manager@mg.clinicedc.org
 DJANGO_EMAIL_ENABLED=False
 DJANGO_EMAIL_HOST=smtp.mailgun.org
 DJANGO_EMAIL_HOST_PASSWORD=
@@ -69,37 +69,31 @@ DJANGO_TIME_ZONE=Africa/Harare
 EDC_ADVERSE_EVENT_ADMIN_SITE=effect_ae_admin
 EDC_ADVERSE_EVENT_APP_LABEL=effect_ae
 EDC_ADVERSE_EVENT_HOSPITALIZATION_APP_LABEL=effect_prn
+EDC_EXPORT_EXPORT_PII_USERS=erikvw
 EDC_LIST_MODEL_APP_LABEL=effect_lists
 EDC_NAVBAR_DEFAULT=effect_dashboard
 EDC_PROTOCOL=LSTM106
 EDC_PROTOCOL_INSTITUTION_NAME=London School of Hygiene and Tropical Medicine
 EDC_PROTOCOL_NUMBER=106
 EDC_PROTOCOL_PROJECT_NAME=EFFECT
-EDC_PROTOCOL_STUDY_OPEN_DATETIME=2019,10,31,0,0,0,UTC
-EDC_PROTOCOL_STUDY_CLOSE_DATETIME=2025,12,31,23,59,59,UTC
+EDC_PROTOCOL_STUDY_OPEN_DATETIME=2022,05,10,0,0,0,UTC
+EDC_PROTOCOL_STUDY_CLOSE_DATETIME=2026,12,31,23,59,59,UTC
 EDC_PROTOCOL_TITLE=EFFECT (Efficacy of Flucytosine and Fluconazole as Early Cryptococcal Treatment) - A phase III randomised controlled trial
 EDC_RANDOMIZATION_ASSIGNMENT_MAP=control=1,intervention=2
 EDC_RANDOMIZATION_BLINDED_TRIAL=True
 EDC_RANDOMIZATION_LIST_PATH=/Users/erikvw/source/effect-edc/effect_edc/tests/randomization_list.csv
 EDC_RANDOMIZATION_UNBLINDED_USERS=erikvw
 EDC_RANDOMIZATION_REGISTER_DEFAULT_RANDOMIZER=True
-EDC_RANDOMIZATION_SKIP_VERIFY=False
+EDC_RANDOMIZATION_SKIP_VERIFY=True
 EDC_SITES_MODULE_NAME=effect_sites
 EDC_SUBJECT_APP_LABEL=effect_subject
 EDC_SUBJECT_CONSENT_MODEL=effect_consent.subjectconsent
 EDC_SUBJECT_REQUISITION_MODEL=effect_subject.subjectrequisition
 EDC_SUBJECT_REFUSAL_MODEL=edc_refusal.subjectrefusal
+EDC_SUBJECT_REQUISITION_MODEL=effect_subject.subjectrequisition
 EDC_SUBJECT_SCREENING_MODEL=effect_screening.subjectscreening
 EDC_SUBJECT_VISIT_MODEL=effect_subject.subjectvisit
 EDC_SUBJECT_VISIT_MISSED_MODEL=effect_subject.subjectvisitmissed
 EDC_SUBJECT_VISIT_MISSED_REASONS_MODEL=effect_lists.subjectvisitmissedreasons
 MAILGUN_API_KEY=
 MAILGUN_API_URL=https://api.mailgun.net/v3/lists
-MYSQL_DATABASE=effect
-MYSQL_ROOT_PASSWORD=
-MYSQL_USER=edc
-MYSQL_USER_PASSWORD=
-TWILIO_AUTH_TOKEN=
-TWILIO_ACCOUNT_SID=
-TWILIO_ENABLED=False
-TWILIO_SENDER=