diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e89c07877eb..c639c37e8b7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,6 +25,7 @@ https://docs.communityhealthtoolkit.org/contribute/code/workflow/#commit-message
 
 # Code review checklist
 <!-- Remove or comment out any items that do not apply to this PR; in the remaining boxes, replace the [ ] with [x]. -->
+- [ ] UI/UX backwards compatible: Test it works for the new design (enabled by default). And test it works in the old design, enable `can_view_old_navigation` permission to see the old design.
 - [ ] Readable: Concise, well named, follows the [style guide](https://docs.communityhealthtoolkit.org/contribute/code/style-guide/), documented if necessary.
 - [ ] Documented: Configuration and user documentation on [cht-docs](https://github.com/medic/cht-docs/)
 - [ ] Tested: Unit and/or e2e where appropriate
diff --git a/.github/actions/deploy-conf/action.yml b/.github/actions/deploy-conf/action.yml
index 4037f5cd455..557f4223135 100644
--- a/.github/actions/deploy-conf/action.yml
+++ b/.github/actions/deploy-conf/action.yml
@@ -28,6 +28,6 @@ runs:
     shell: bash
     working-directory: ${{ inputs.directory }}
   - name: run cht
-    run: npx cht --url=https://${{ inputs.username }}:${{ inputs.password }}@${{ inputs.hostname }} compile-app-settings convert-app-forms convert-collect-forms convert-contact-forms upload-app-settings upload-app-forms upload-collect-forms upload-contact-forms upload-resources upload-custom-translations --force
+    run: npx cht --url=https://${{ inputs.username }}:${{ inputs.password }}@${{ inputs.hostname }} compile-app-settings convert-app-forms convert-collect-forms convert-contact-forms convert-training-forms upload-app-settings upload-app-forms upload-collect-forms upload-contact-forms upload-training-forms upload-resources upload-custom-translations --force
     shell: bash
     working-directory: ${{ inputs.directory }}
diff --git a/README.md b/README.md
index 0291e7e92f8..1051f72d244 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Builds brought to you courtesy of GitHub Actions.
 
 ## Copyright
 
-Copyright 2013-2022 Medic Mobile, Inc. <hello@medic.org>
+Copyright 2013-2025 Medic Mobile, Inc. <hello@medic.org>
 
 ## License
 
diff --git a/admin/src/js/services/session.js b/admin/src/js/services/session.js
index 7b1dd7d79c6..68c6ab091bd 100644
--- a/admin/src/js/services/session.js
+++ b/admin/src/js/services/session.js
@@ -38,11 +38,14 @@ const _ = require('lodash/core');
         }
         ipCookie.remove(COOKIE_NAME, { path: '/' });
         userCtxCookieValue = undefined;
+        // Clear browser history to prevent loading page on browser's back button after logout.
+        $window.history.pushState(null, null, '/');
         $window.location.href = `/${Location.dbName}/login?${params.toString()}`;
       };
 
       const logout = function() {
-        return $http.delete('/_session')
+        return $http
+          .delete('/_session')
           .catch(function() {
             // Set cookie to force login before using app
             ipCookie('login', 'force', { path: '/' });
diff --git a/admin/tests/unit/services/session.spec.js b/admin/tests/unit/services/session.spec.js
index dc20c145b94..3170e009857 100644
--- a/admin/tests/unit/services/session.spec.js
+++ b/admin/tests/unit/services/session.spec.js
@@ -6,6 +6,7 @@ describe('Session service', function() {
   let ipCookie;
   let ipCookieRemove;
   let location;
+  let pushStateStub;
   let $httpBackend;
   let Location;
 
@@ -14,6 +15,7 @@ describe('Session service', function() {
     ipCookie = sinon.stub();
     ipCookieRemove = sinon.stub();
     ipCookie.remove = ipCookieRemove;
+    pushStateStub = sinon.stub();
     Location = {};
     location = {};
     module(function ($provide) {
@@ -24,6 +26,7 @@ describe('Session service', function() {
       $provide.factory('$window', function() {
         return {
           angular: { callbacks: [] },
+          history: { pushState: pushStateStub },
           location: location,
         };
       });
@@ -59,6 +62,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal(`/DB_NAME/login?redirect=CURRENT_URL&username=${expected.name}`);
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -73,6 +78,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal('/DB_NAME/login?redirect=CURRENT_URL');
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -96,6 +103,7 @@ describe('Session service', function() {
     service.checkCurrentSession();
     $httpBackend.flush();
     chai.expect(ipCookieRemove.callCount).to.equal(0);
+    chai.expect(pushStateStub.notCalled).to.be.true;
     done();
   });
 
@@ -114,6 +122,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal(`/DB_NAME/login?redirect=CURRENT_URL&username=${expected.name}`);
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -125,6 +135,7 @@ describe('Session service', function() {
     service.checkCurrentSession();
     $httpBackend.flush();
     chai.expect(ipCookieRemove.callCount).to.equal(0);
+    chai.expect(pushStateStub.notCalled).to.be.true;
     done();
   });
 
diff --git a/api/resources/translations/messages-ar.properties b/api/resources/translations/messages-ar.properties
new file mode 100644
index 00000000000..1b86b058362
--- /dev/null
+++ b/api/resources/translations/messages-ar.properties
@@ -0,0 +1,1352 @@
+Accept\ plain-text\ messages = قبول الرسائل النصية العادية
+Accept\ plain-text\ messages\ help = حدّد مربع الاختيار إذا كنت تريد قبول الرسائل النصية SMS بالإضافة إلى التقارير. إذا لم يتم تحديد هذا المربّع، سيتم إرسال رسالة خطأ إلى أي شخص يرسل شيئاً غير التقارير.
+Activity = النشاط
+Add\ Message = إضافة رسالة
+Add\ User = إضافة مستخدِم
+Add\ Validation = إضافة تحقق
+Add\ new\ language = إضافة لغة جديدة
+Add\ person = إضافة شخص
+Add\ place = إضافة مكان
+Add\ recipient = إضافة مستلِم
+Advanced = خيارات متقدّمة
+Advanced\ settings\ intro = للتحقّق من وجود إصدارات أحدث من CHT وتثبيتها أو لضبط الإعدادات التقنية، يُرجى استخدام
+Advanced\ settings\ outro = هذا مخصّص للمستخدمين ذوي خلفية تقنية عالية.
+All\ contact\ types = كل أنواع جهات الاتصال
+All\ facilities = كل الأماكن
+All\ form\ types = كل أنواع النماذج
+Analytics = التحليلات
+Antenatal\ Care = الرعاية قبل الولادة
+Any\ date = أي تاريخ
+Any\ status = أي حالة
+api.startup.checks = عمليات التحقق من التثبيت
+api.startup.config = تطبيق التكوين
+api.startup.forms = تثبيت النماذج
+api.startup.install = جارٍ التثبيت
+api.startup.index = جارٍ فهرسة البيانات
+api.startup.migrate = جارٍ ترحيل البيانات
+api.startup.title = جارٍ بدء {{ branding.name }}
+Application\ Text = نص التطبيق
+Apply = تطبيق
+Appointment\ Date = تاريخ الموعد
+At\ home\ with\ SBA = في المنزل بمساعدة قابلة ماهرة
+At\ home\ without\ SBA = في المنزل بدون مساعدة قابلة ماهرة
+Audit\ Logs = سجلات التدقيق
+Automated\ Reply = رد تلقائي
+Available\ Fields = الحقول المتاحة
+Back = رجوع
+Backup = نسخة احتياطية
+Basic = أساسي
+Bug\ description = وصف الخطأ
+Cancel = إلغاء
+Choose\ File = اختيار ملف
+Choose\ file = اختيار ملف
+Clear\ all\ filters = إعادة ضبط الفلاتر
+Clinic = المنطقة
+Clinic\ Contact\ Name = الاسم
+Clinic\ Contact\ Phone = رقم الهاتف
+Clinics = المناطق
+Community\ health\ worker = عامل صحي مجتمعي
+Configuration = تكوين
+Confirm = تأكيد
+Confirm\ Password = تأكيد كلمة المرور
+Confirm\ delete = هل تريد بالتأكيد حذف {{name}}؟ لا يمكن التراجع عن هذه العملية.
+Contact = جهة الاتصال
+Contact\ type = نوع جهة الاتصال
+Contacts = الأشخاص
+Contacts\ file\ help = حدّد ملف json. الذي يحتوي على جهات الاتصال.
+Content = المحتوى
+Continue = متابعة
+Current\ Password = كلمة المرور الحالية
+Dashboard\ settings\ page = صفحة إعدادات لوحة المعلومات
+Date\ display\ format = تنسيق عرض التاريخ
+Datetime\ display\ format = تنسيق عرض التاريخ والوقت
+Default = الإعدادات الافتراضية
+Default\ Application\ Language = لغة التطبيق الافتراضية
+Default\ country\ code = رمز البلد الافتراضي
+Default\ country\ code\ help = سيتم تخصيص هذا الرمز لجميع أرقام الهواتف التي تم إدخالها في النظام بدون رمز البلد.
+Delete = حذف
+Deleting = جارٍ الحذف...
+Disable = تعطيل
+Discard\ changes\ to\ current\ language = هل تريد الاستمرار وتجاهل التغييرات التي أجريت على اللغة الحالية؟
+Display = عرض
+District = المقاطعة
+District\ Contact\ Name = اسم جهة الاتصال
+District\ Contact\ Phone = رقم الهاتف
+District\ Hospital = المقاطعة
+District\ Name = اسم المقاطعة
+Districts = المقاطعات
+Download = تنزيل
+EDD = تاريخ الولادة المتوقع
+Edit = تعديل
+Edit\ User = تعديل بيانات المستخدِم
+Edit\ User\ Profile = تعديل ملف تعريف المستخدِم
+Edit\ language = تعديل اللغة
+Edit\ person = تعديل بيانات الشخص
+Edit\ place = تعديل المكان
+Edit\ translation = تعديل الترجمة
+Email\ Address = عنوان البريد الإلكتروني
+Enable = تمكين
+Enter\ message = أدخل الرسالة
+Error\ deleting\ document = حدث خطأ في حذف المستند
+Error\ fetching\ contacts = حدث خطأ في إحضار الأشخاص
+Error\ fetching\ messages = حدث خطأ في إحضار الرسائل
+Error\ fetching\ reports = حدث خطأ في إحضار التقارير
+Error\ fetching\ tasks = حدث خطأ في إحضار المهام
+Error\ parsing\ file = حدث خطأ في تحليل الملف
+Error\ parsing\ properties\ file = حدث خطأ في تحليل ملف الخصائص
+Error\ retrieving\ settings = خطأ في استرداد الإعدادات
+Error\ saving\ feedback = خطأ في حفظ الملاحظات
+Error\ saving\ settings = حدث خطأ أثناء حفظ الإعدادات. يُرجى المحاولة مرة أخرى.
+Error\ sending\ message = خطأ في إرسال الرسالة
+Error\ updating\ contact = خطأ في التحديث
+Error\ updating\ facility = خطأ في تحديث جهة الاتصال
+Error\ updating\ group = خطأ في تحديث المجموعة
+Error\ updating\ user = خطأ في تحديث بيانات المستخدِم
+Errors = الأخطاء
+Everyone\ at = {{facility}} - جميع جهة الاتصال وعددها {{count}}
+Exactly = بالظبط
+Export = تصدير
+External\ ID = معرّف خارجي
+Extra\ search\ words = كلمات بحث إضافية
+Facility = المكان
+Facility\ nurse = ممرضة المرفق
+Failed\ validation = تعذر التحقّق
+File\ not\ found = لم يتم العثور على الملف
+For\ example = على سبيل المثال\:
+Forms = نماذج التطبيق
+From = مِن
+Full\ Name = الاسم الكامل
+Gateway\ number = رقم هاتف البوابة
+Gateway\ number\ help = هذا هو الرقم الهاتفي الذي يجب على المراسلين المتنقلين إرسال تقاريرهم إليه، وهو أيضاً الرقم الذي سيتلقون منه الرسائل.
+Generated\ report\ field = حقل التقرير المُنشأ
+Health\ Center = مركز الصحة
+Health\ Center\ Contact\ Name = اسم جهة الاتصال
+Health\ Center\ Contact\ Phone = رقم الهاتف
+Health\ Center\ Name = اسم مركز الصحة
+Health\ Centers = مراكز الصحة
+Help = المساعدة
+Import = استيراد
+Import\ translations = استيراد الترجمات
+Incoming\ Reports = التقارير الواردة
+Installed\ Forms = نماذج التطبيق المثبّتة
+Institutional\ Delivery = التسليم المؤسسي
+Invalid = غير صالح
+Invalid\ contact\ numbers = هؤلاء المستلمون ليس لديهم رقم اتصال صالح/: {{recipients}}
+LMP\ date = تاريخ الدورة الشهرية الأخيرة
+Language = اللغة
+Language\ For\ Outgoing\ Messages = لغة الرسائل الصادرة
+Language\ code = رمز اللغة
+Language\ code\ help = رمز اللغة المكوّن من رقمَين أو ثلاثة أرقام للغة التي تلي
+Language\ name\ help = اسم العرض للغة.
+Language\ to\ edit = اللغة التي يجب تعديلها
+Languages = اللغات
+Last\ Appointment = الموعد الأخير
+Log\ Out = تسجيل الخروج
+Message\ All = إرسال رسالة إلى الكل
+Message\ Body = الرسالة
+Message\ UUID = رسالة المعرّف الفريد العالمي
+Messages = الرسائل
+Messaging\ window = نافذة المراسلة
+Missing\ translations = {{missing}}: ترجمات مفقودة
+Mute = كتم الصوت
+Name = الاسم
+New\ person = شخص جديد
+Next = التالي
+No\ contact\ selected = لم يتم تحديد أي شخص
+No\ contacts\ found = لم يتم العثور على أي أشخاص
+No\ district = لا توجد مقاطعة
+No\ forms\ found = لم يتم العثور على أي نماذج لهذا الجدول الزمني.
+No\ message\ selected = لم يتم تحديد أي رسالة
+No\ messages\ found = لم يتم العثور على أي رسائل.
+No\ more\ contacts = لم يتم العثور على المزيد من الأشخاص
+No\ more\ messages = لم يتم العثور على المزيد من الرسائل
+No\ more\ reports = لم يتم العثور على المزيد من التقارير
+No\ records\ found = لم يتم العثور على أي سجلات
+No\ registrations\ found = لم يتم العثور على أي تسجيلات لهذا الجدول الزمني. يشير هذا إلى وجود مشكلة في التكوين.
+No\ report\ selected = لم يتم تحديد أي تقرير
+No\ reports\ found = لم يتم العثور على أي تقارير
+No\ schedules\ found = لم يتم العثور على أي جداول زمنية
+No\ submission = لا تشارك بيانات التأثير
+No\ task\ selected = لم يتم تحديد أي مهمة
+No\ tasks\ found = لم يتم العثور على أي مهام
+Notes = ملاحظات
+Notifications = الإشعارات
+Number\ in\ month = {{count}} في {{month}}
+Number\ of\ contact\ types = عدد أنواع جهات الاتصال {{number}}
+Number\ of\ facilities = عدد الأماكن {{number}}
+Number\ of\ form\ types = عدد أنواع النماذج {{number}}
+Number\ of\ visits = زيارات تزيد عن {{number}}+
+On\ the\ day = في {{day}}
+Outgoing\ Message = رسالة صادرة
+Overview = نظرة عامة
+Overwrite\ Existing\ Records = استبدال السجلات الموجودة
+Password = كلمة المرور
+Passwords\ must\ match = يجب أن تتطابق كلمات المرور.
+Patient\ History = تاريخ المريضـ(ـة)
+Patient\ ID = معرّف المريضـ(ـة)
+Patient\ Name = اسم المريضـ(ـة)
+Patient\ Report = تقرير المريضـ(ـة)
+People = الأشخاص
+Person = الشخص
+Phone = الهاتف
+Phone\ Number = الهاتف
+Phone\ number\ conversion = تحويل رمز البلد
+Phone\ number\ example = سيُضاف رمز البلد الافتراضي المكوّن مسبقاً إذا لزم الأمر، على سبيل المثال/: 0275551234 أو ‏‎+64275551234
+Phone\ number\ not\ valid = ليس رقم هاتف صالحاً.
+Places = الأماكن
+Please\ select\ a\ facility = يُرجى تحديد شخص لإعادة تعيينه كمرسِل لهذا التقرير.
+Pregnant\ patient = المريضـ(ـة) الحامل
+Previous = السابق
+Primary\ Contact\ For = جهة اتصال رئيسية لـ
+Primary\ contact = جهة اتصال رئيسية
+Primary\ location = الموقع الأساسي
+Processed\ number\ of\ total\ records = تمت معالجة {{number}} من السجلات وإجمالي عددها {{total}}...
+RC\ Code = الرمز
+Reading\ file = جارٍ قراءة الملف...
+Registration\ example = على سبيل المثال، لتسجيل "{{name}}" سترسل\:
+Registration\ format = قم بالتسجيل في سير عمل هذه الرسالة عن طريق إرسال رسالة SMS بالتنسيق التالي\:
+Registrations = التسجيلات
+Reload = إعادة تحميل
+Replace\ country\ code\ for = استبدال رمز البلد لـ
+Reply = رد
+Reply\ to\ name = الرد على {{contact}}
+Report\ Bug = الإبلاغ عن خطأ
+Report\ format = تم تسجيله عن طريق إرسال رسالة SMS بالتنسيق التالي\:
+Reporting\ Rates = معدلات إعداد التقارير
+Reports = التقارير
+Restore = استعادة
+Save\ failed = تعذّر الحفظ
+Saved = تم الحفظ
+Schedule = الجدول الزمني
+Schedule\ name = الجدول الزمني\: {{name}}
+Schedules = الجداول الزمنية
+Search = بحث
+Select\ a\ language = اختيار لغة
+Select\ a\ type = اختيار نوع
+Send = إرسال
+Send\ Message = إرسال رسالة
+Send\ scheduled\ messages\ between = إرسال رسائل مُجدوَلة بين
+Sending = جارٍ الإرسال...
+Sent\ By = تم الإرسال مِن
+Server\ Logs = سجلات الخادم
+Set\ as\ default\ application\ language = ضبط كلغة تطبيق افتراضية
+Set\ as\ language\ for\ outgoing\ messages = ضبط كلغة للرسائل الصادرة
+Settings = الإعدادات
+Showing\ number\ of\ total = إظهار {{number}} من {{total}}.
+Skipped\ number\ of\ records = تم تخطي عدد من السجلات يبلغ {{number}}.
+Start = ابدأ
+Start\ messages\ based\ on = ابدأ الرسائل بناءً على
+Start\ new\ conversation = ابدأ محادثة جديدة
+Submit = إرسال
+Submit\ Report = إرسال تقرير
+Submit\ via\ either = جرّب أونلاين أولاً، ثم رسالة SMS
+Submit\ via\ sms = رسائل SMS فقط
+Submit\ via\ web = أونلاين فقط
+Submitting = جارٍ الإرسال...
+Task\ Message = رسالة المهمة
+Tasks = المهام
+The\ first\ time\ must\ be\ earlier\ than\ the\ second\ time = يجب أن تكون المرة الأولى قبل المرة الثانية.
+The\ group\ must\ be\ an\ integer = يجب أن تكون المجموعة عدداً صحيحاً
+The\ offset\ unit\ must\ be\ an\ integer = يجب أن تكون وحدة الإزاحة عدداً صحيحاً
+The\ unit\ must\ be\ an\ integer = يجب أن تكون الوحدة عدداً صحيحاً
+This\ message\ is\ part\ of\ group = هذه الرسالة جزء من المجموعة
+To\ Phone = إلى الهاتف
+Translation\ file = ملف الترجمة
+Translation\ file\ help = حدِّد ملف properties. الذي تريد استيراده لاستبدال الترجمات الخاصة بهذه اللغة. أسهل طريقة لإنشاء ملف بالتنسيق الصحيح هي تصدير الترجمات لهذه اللغة، وإجراء أي تعديلات، ثم الاستيراد.
+Translations = الترجمات
+Unread\ below = غير مقروءة أدناه
+Unsaved\ changes = تغييرات غير محفوظة
+Unverified = لم يتم التحقق منه
+Unverify = إلغاء التحقّق
+Update = تحديث
+Update\ Facility = تحرير بيانات المُرسِل
+Upload\ Forms = تحميل نماذج التطبيق
+Upload\ failed = تعذّر التحميل
+Upload\ succeeded = نجح التحميل
+User\ Feedback = ملاحظات المستخدِم
+User\ Name = اسم المستخدِم
+User\ Type = نوع المستخدِم
+Users = المستخدمون
+Valid = صالح
+Validation\ message = إذا نجحت جميع عمليات التحقق، فسيتم إرسال هذه الرسالة إلى المُرسِل\:
+Validations = عمليات التحقق
+Validity = التحقّق
+Verification = التحقق
+Verified = تم التحقق منه
+Verify = يتحقق
+Village\ Name = المدينة
+Visits = الزيارات
+Weeks\ Pregnant = أسابيع الحمل
+_id = تسجيل المعرّف الفريد العالمي
+about = حول
+about.cht = مشغّل بواسطة
+action.clinic.add = إضافة منطقة
+action.district_hospital.add = مقاطعة جديدة
+action.health_center.add = مركز صحة جديد
+action.person.add = شخص جديد
+action.report.add = إجراء جديد
+admin.app.name = إدارة التطبيق
+admin.display = عرض
+admin.display.datetime = التاريخ والوقت
+admin.message.queue = الرسائل الصادرة
+admin.message.queue.created = تم الإنشاء
+admin.message.queue.due = الموعد النهائي
+admin.message.queue.error = حدث خطأ في إحضار الرسائل
+admin.message.queue.message = الرسالة
+admin.message.queue.recipient = المستلِم
+admin.message.queue.scheduled = مُجدوَل زمنياً
+admin.message.queue.status = الحالة
+admin.message.queue.tab.due = الموعد النهائي
+admin.message.queue.tab.muted.future = لن يتم الإرسال
+admin.message.queue.tab.muted.past = لم يتم الإرسال
+admin.message.queue.tab.scheduled = مُجدوَل زمنياً
+admin.message.queue.updated = آخر تحديث
+admin.message.queue.view.report = عرض التقرير
+admin.pagination.detail = إظهار {{first}} - {{last}}  من إجمالي العناصر البالغ عددها {{total}}
+admin.pagination.first = الأول
+admin.pagination.last = الأخير
+admin.pagination.next = التالي
+admin.pagination.prev = السابق
+admin.targets.description = سيُظهر هدف 1- مستهدفاً بدون هدف.
+after\ the = بعد
+analytics.anc.active-pregnancies = حالات الحمل النشطة
+analytics.anc.delivery-locations = مواقع الولادة المبلغ عنها
+analytics.anc.high-risk = حالات الحمل عالية الخطورة
+analytics.anc.missed-appointments = المواعيد الفائتة مؤخراً
+analytics.anc.missing-reports = تقارير الولادة الفائتة
+analytics.anc.monthly-births = الولادات الشهرية
+analytics.anc.monthly-registrations = حالات الحمل الشهرية المسجلة
+analytics.anc.total-births = إجمالي عدد الولادات
+analytics.anc.upcoming-appointments = المواعيد القادمة
+analytics.anc.upcoming-edds = النساء اللاتي لديهن مواعيد مقبلة لتاريخ الولادة المتوقع
+analytics.anc.visits-completed = الزيارات التي تم إكمالها أثناء الحمل
+analytics.anc.visits-completed.description = حالات الحمل المكتملة التي كانت...
+analytics.anc.visits-during = الزيارات المكتملة حتى الآن
+analytics.anc.visits-during.description = حالات الحمل النشطة التي كانت...
+analytics.connection.error = لم نتمكن من استرداد البيانات في هذا الوقت.
+analytics.reporting.change_time_unit = تغيير وحدة الوقت
+analytics.reporting.clinics_size = وحدة الإبلاغ
+analytics.reporting.date_range = نطاق التاريخ
+analytics.reporting.district = اختيار مقاطعة
+analytics.reporting.form = اختيار نموذج
+analytics.reporting.health_centers_size = مؤسسة صغير أو متوسطة الحجم
+analytics.reporting.incomplete = تقارير غير صالحة
+analytics.reporting.last_time_unit = آخِر {{quantity}} {{time_unit}}
+analytics.reporting.not_submitted = التقارير مفقودة
+analytics.reporting.reporting_rate = معدل الإبلاغ
+analytics.reporting.reports = التقارير
+analytics.target.add = إضافة مستهدف
+analytics.target.aggregates = المجاميع المستهدفة
+analytics.target.aggregates.disabled = المجاميع المستهدفة معطلة
+analytics.target.aggregates.error = خطأ في إحضار المجاميع المستهدفة
+analytics.target.aggregates.error.no.contact = خطأ في تحميل المجاميع المستهدفة. ليس لدى المستخدم مكان رئيسي، أو ليست لديه إمكانية الوصول إلى المكان الرئيسي المرتبط. تحدّث إلى المسؤول لديك لتصحيح هذا الأمر.
+analytics.target.aggregates.error.not.found = خطأ في تحميل المجموع المستهدف\: لم يتم العثور على المستهدف.
+analytics.target.aggregates.no.data = لا توجد بيانات
+analytics.target.aggregates.no.target.selected = لم يتم تحديد المستهدف.
+analytics.target.aggregates.no.targets = لم يتم العثور على المجاميع المستهدفة
+analytics.target.aggregates.ratio = {{pass}} من {{total}}
+analytics.target.aggregates.reported = تم الإبلاغ
+analytics.target.aggregates.select.error = خطأ في تحميل المجموع المستهدف.
+analytics.target.aggregates.supervisees.meeting.goal = هدف اجتماع العاملين الصحيين المجتمعيين
+analytics.target.aggregates.total = الإجمالي
+analytics.target.aggregates.reporting_period = فترة الإبلاغ
+analytics.target.goal = الهدف
+analytics.target.goal.help = إذا كنت لا تريد عرض هدف، فأدخِل قيمة "1-".
+analytics.target.icon = أيقونة
+analytics.target.icon.help = معرّف الأيقونة المُكوّنة.
+analytics.target.id = معرّف فريد
+analytics.target.monthly_goal = الهدف
+analytics.target.name = الاسم
+analytics.target.name.help = إذا أضفت ترجمات لاسم المستهدف هنا، فستظل بحاجة إلى إضافتها في صفحة اللغات أيضاً.
+analytics.target.type = النوع
+analytics.target.type.count = العدد
+analytics.target.type.percent = النسبة المئوية
+analytics.targets = المستهدفات
+analytics.targets.registrations = العائلات المسجلة
+analytics.targets.unique.id = يجب أن يكون معرّف المستهدف فريداً
+analytics.unconfigured = لم يتم تكوين وحدات تحليلية.
+and = و
+and\ should\ be\ sent\ at = ويجب إرسالها في
+android_app.data_usage.app.title = هذا التطبيق
+android_app.data_usage.description = ملاحظة: هذه القيم موجودة منذ تشغيل الجهاز.
+android_app.data_usage.rx = تم الاستلام
+android_app.data_usage.system.title = على مستوى النظام
+android_app.data_usage.title = استخدام بيانات التطبيق
+android_app.data_usage.tx = تم النقل
+android_app.os_android_version.title = نظام تشغيل أندرويد
+android_app.package_name.title = اسم حزمة تطبيق أندرويد
+android_app.version.title = إصدار تطبيق أندرويد
+android_app.version_code.title = رمز نسخة تطبيق أندرويد
+app.name = التطبيق
+app.version.unknown = غير معروف - الاتصال بالإنترنت مطلوب.
+associated.contact = جهة الاتصال المرتبطة
+associated.contact.help = عندما ينشئ هذا المستخدم التقارير، سيتم تعيينها إلى جهة الاتصال هذه
+autoreply = الرد التلقائي
+birth_date = تاريخ الميلاد
+branding = العلامة التجارية
+branding.favicon.field = أيقونة صغيرة
+branding.favicon.field.help = تظهر هذه الأيقونة في علامة تبويب المتصفح. يجب أن تكون بحجم 32 × 32 بكسل، ملف ico.
+branding.logo.field = الشعار
+branding.logo.field.help = يظهر في صفحة تسجيل الدخول والأجهزة ذات الشاشات الكبيرة.
+branding.title.field = العنوان
+branding.title.field.help = سيتم عرض هذا النص في علامة تبويب المتصفح وكعنوان لتطبيق الويب التقدمي.
+branding.icon.field = أيقونة كبيرة
+branding.icon.field.help = ستظهر لعمليات تثبيت تطبيق الويب التقدمي. يجب أن تكون بحجم 144 بكسل مربع على الأقل.
+browser.compatibility.title = الاتصال بالمشرف
+browser.compatibility.description = يُرجى الاتصال بالمشرف لديك وإخباره بأن متصفّحك يحتاج إلى تحديث.
+browser.compatibility.confirm = موافق
+bulkdelete.confirm.action = حذف
+bulkdelete.confirm.title = هل تريد حذف السجل؟
+bulkdelete.confirm.title.plural = هل تريد حذف السجلات المحدّدة؟
+call = اتصال
+case_id = معرّف الحالة
+child_birth_date = تاريخ ميلاد الطفل
+child_birth_outcome = حصيلة ميلاد الطفل
+child_birth_weight = وزن الطفل عند الولادة
+cleared = طابع زمني تم مسحه
+clientDdoc.version = مراجعة تطبيق الويب الخاص بالعميلـ(ـة)
+clinic.field.children = الأشخاص
+clinic.field.contact = جهة اتصال رئيسية
+clinic.field.external_id = معرّف خارجي
+clinic.field.location = الموقع
+clinic.field.name = الاسم
+clinic.field.notes = ملاحظات
+clinic.field.parent = مركز الصحة
+close = إغلاق
+configuration.authorization = الأدوار والأذونات
+configuration.date.format.help = تنسيق Moment.js
+configuration.enable.token.login = تمكين تسجيل الدخول عبر رابط رسائل SMS
+configuration.enable.token.login.disable = تعطيل تسجيل الدخول عبر رسائل SMS.
+configuration.enable.token.login.enabled.active = تم تمكين تسجيل الدخول عبر رسائل SMS لهذا المستخدم. تنتهي صلاحية الرابط في {{date}}.
+configuration.enable.token.login.enabled.expired = تم تمكين تسجيل الدخول عبر رسائل SMS لهذا المستخدم. انتهت صلاحية الرابط في {{date}}.
+configuration.enable.token.login.enabled.inactive = تم تمكين تسجيل الدخول عبر رسائل SMS لهذا المستخدم. تم الوصول إلى الرابط في {{date}}.
+configuration.enable.token.login.help = عند الحفظ، سيتلقى المستخدِم تعليمات تسجيل الدخول ورابط تسجيل الدخول عبر رسائل SMS. يتطلب من المستخدِم أن يكون لديه رقم هاتف صالح.
+configuration.enable.token.login.no.modify = لا تقم بإجراء أي تغييرات على تسجيل الدخول عبر رسائل SMS.
+configuration.enable.token.login.phone = مطلوب رقم هاتف صالح لتسجيل الدخول عبر رسائل SMS.
+configuration.enable.token.login.refresh = إعادة إنشاء وإعادة إرسال رسالة SMS لتسجيل الدخول.
+configuration.enable.token.login.refresh.help = سيؤدي تعطيل أو إعادة إنشاء رسالة تسجيل الدخول عبر SMS إلى تغيير كلمة مرور المستخدِم، ما سيؤدي إلى تسجيل خروج المستخدِم.
+configuration.messagetest = اختبار الرسالة
+configuration.permission = الإذن
+configuration.permissions = الأذونات
+configuration.role = الدور
+configuration.role.offline = غير متصل بالإنترنت
+configuration.role.offline.warning = يستطيع المستخدمون الذين لديهم إمكانية الوصول بدون اتصال بالإنترنت عرض المستندات وتحديثها بدون الحاجة إلى اتصال بالإنترنت، ويمكنهم فقط عرض جزء من البيانات. يمكن لمستخدمي الإنترنت الوصول إلى جميع المستندات، ولكن يجب أن يكون لديهم اتصال بالإنترنت في جميع الأوقات.
+configuration.roles = الأدوار
+configuration.roles.add = إضافة دور جديد
+configuration.sms = رسالة SMS
+configuration.sms.forms = نماذج رسائل SMS
+configuration.sms.forms.title = يجب اختيار ملف XML وملف بيانات التعريف قبل النقر على زر التحميل. لا يجوز تحميل أكثر من ملف نموذج تطبيق واحد في كل مرة، وسيتم استبدال أي نماذج موجودة.
+configuration.sms.settings = الإعدادات الأساسية
+configuration.sms.test.description = استخدم هذه الصفحة لإرسال رسالة اختبار إلى تطبيق الإنتاج بدون الحاجة إلى المرور عبر بوابة رسائل SMS. تأكد من استخدام رقم هاتف مسجل في ملف تعريف أحد العاملين الصحيين المجتمعيين لمحاكاة تقرير صادر عنه حول مريضـ(ـة) معيّنـ(ـة).
+configuration.sms.test.from.number = من رقم الهاتف
+configuration.sms.test.message.description = الحد الأقصى 144 حرفاً
+configuration.sms.test.number.validation.description = يُرجى إدخال رقم هاتف صالح بدون شرطات أو علامات ترقيم.
+configuration.sms.test.title = رسالة الاختبار
+configuration.user.place.contact = يجب أن تكون جهة الاتصال المرتبطة تابعة للمكان.
+configuration.user.replication.limit.exceeded = تحذير\! سيكرر هذا المستخدم {{total_docs}} من المستندات، ما يتجاوز الحد الموصى به. عدِّل "الدور" أو "المكان" لإجراء التغييرات اللازمة، ثم اضغط على "إرسال" للمتابعة. إذا كان هناك العديد من المستندات للمستخدم، يُنصح بتعديل قواعد حذف المستندات.
+confirm.delete = حذف هذا السجل سيؤدي إلى إزالته نهائياً من تطبيقك.
+confirm.delete.plural = سيتم حذف {{number}} سجلاً بشكل دائم.
+confirm.delete.progress = الحذف جارٍ
+confirm.delete.totals = تم حذف {{totalDeleted}}/{{totalSelected}}...
+confirm.delete.user = هل تريد بالتأكيد حذف هذا المستخدم؟ لا يمكن التراجع عن هذه العملية.
+confirm.destructive.navigation.forms = هذا النموذج غير مكتمل. ستفقد بياناتك إذا غادرت الآن. يكتمل النموذج فقط عندما تضغط على "إرسال".
+confirm.destructive.navigation.submit = خروج
+confirm.destructive.navigation.title = هل ترغب في الخروج من النموذج؟
+confirm.logout = ستحتاج إلى اتصال بالإنترنت لتسجيل الدخول مرة أخرى.
+password.updated = تم تحديث كلمة مرورك بنجاح.
+confirm.verification = سيتم التحقق من هذا التقرير كـ ?correct?. لا يمكن تغيير ذلك لاحقاً.
+confirm.verification.submit = تحقق من الصحة
+confirm.verification.title = تحقق من التقرير
+contact.age = العمر
+contact.created = تم إنشاء جهة الاتصال
+contact.deceased.date.prefix = توفّي
+contact.deceased.title = المتوفّون
+contact.deceased.view = عرض عدد المتوفّين ({{count}})
+contact.history = سجلّ جهة الاتصال
+contact.last.visited.date = تمت الزيارة في {{date}}
+contact.last.visited.unknown = آخر زيارة غير معروفة
+contact.muted = مكتوم
+contact.muted.modal.text = جهة الاتصال هذه مكتومة حالياً. يمكنك المتابعة، ولكن ستظل جهة الاتصال مكتومة، ولن يتم إنشاء أي مهام لهذه الجهة حتى تقوم بإلغاء كتمها.
+contact.muted.modal.title = جهة الاتصال المكتومة
+contact.name = اسم جهة الاتصال
+contact.new_place.button = مكان جديد
+contact.no.children = لا يوجد أشخاص في هذا المكان.
+contact.parent = ينتمي إلى
+contact.parent.external_id = معرّف المنطقة الخارجية
+contact.parent.name = اسم المنطقة
+contact.parent.parent.contact.name = اسم جهة الاتصال بمركز الصحة
+contact.parent.parent.external_id = المعرّف الخارجي لمركز الصحة
+contact.parent.parent.name = اسم مركز الصحة
+contact.parent.parent.parent.external_id = المعرّف الخارجي للمقاطعة
+contact.parent.parent.parent.name = اسم المقاطعة
+contact.place.id = معرّف المكان
+contact.primary_contact_name = جهة اتصال رئيسية\: {{name || 'none'}}
+contact.profile = ملف تعريف
+contact.profile.anc_visit = زيارات الرعاية السابقة للولادة مكتملة
+contact.profile.delivery_code.f = الولادة في المرفق
+contact.profile.delivery_code.facility_birth = الولادة في المرفق
+contact.profile.delivery_code.facility_stillbirth = ولادة وليد ميت في المرفق
+contact.profile.delivery_code.home_no_sba_birth = الولادة في المنزل بدون مساعدة قابلة ماهرة
+contact.profile.delivery_code.home_no_sba_stillbirth = ولادة وليد ميت بدون مساعدة قابلة ماهرة
+contact.profile.delivery_code.home_sba_birth = الولادة في المنزل بمساعدة قابلة ماهرة
+contact.profile.delivery_code.home_sba_stillbirth = ولادة وليد ميت في المنزل بمساعدة قابلة ماهرة
+contact.profile.delivery_code.miscarriage = الإجهاض
+contact.profile.delivery_code.ns = الولادة في المنزل بدون مساعدة قابلة ماهرة
+contact.profile.delivery_code.s = الولادة في المنزل بمساعدة قابلة ماهرة
+contact.profile.delivery_code.unknown = الولادة
+contact.profile.delivery_date = تاريخ الولادة
+contact.profile.edd = تاريخ الولادة المتوقع
+contact.profile.exit_date = تاريخ الخروج
+contact.profile.gender = الجنس
+contact.profile.growth_monitoring = مراقبة النمو
+contact.profile.height = الطول (سم)
+contact.profile.height_at_exit = الطول عند الخروج (سم)
+contact.profile.hfa = الدرجة المعيارية للطول بالنسبة للعمر
+contact.profile.imam = الإدارة المتكاملة لسوء التغذية الحاد
+contact.profile.imam_history = سجلّ الإدارة المتكاملة لسوء التغذية الحاد
+contact.profile.imm.bcg = السل
+contact.profile.imm.cholera = الكوليرا
+contact.profile.imm.doses = {{count}} من {{total}}
+contact.profile.imm.dpt = جرعة معززة من لقاح الدفتيريا والسعال الديكي والتيتانوس
+contact.profile.imm.fipv = جرعة جزئية من لقاح شلل الأطفال المعطل
+contact.profile.imm.flu = الإنفلونزا
+contact.profile.imm.generic = عدد التقارير
+contact.profile.imm.hep_a = التهاب الكبد A
+contact.profile.imm.hep_b = التهاب الكبد B
+contact.profile.imm.hpv = فيروس الورم الحليمي البشري
+contact.profile.imm.ipv = شلل الأطفال غير النشط
+contact.profile.imm.jap_enc = التهاب الدماغ الياباني
+contact.profile.imm.meningococcal = المكورات السحائية
+contact.profile.imm.mmr = الحصبة، النكاف، الحصبة الألمانية
+contact.profile.imm.mmrv = الحصبة، النكاف، الحصبة الألمانية، الجدري المائي
+contact.profile.imm.penta = اللقاح الخماسي التكافؤ
+contact.profile.imm.pneumococcal = لقاح المكورات الرئوية
+contact.profile.imm.polio = شلل الأطفال الفموي
+contact.profile.imm.rotavirus = فيروس الروتا
+contact.profile.imm.typhoid = التيفود
+contact.profile.imm.vitamin_a = فيتامين A
+contact.profile.imm.yellow_fever = الحمى الصفراء
+contact.profile.immunizations = التطعيمات
+contact.profile.last_treatment = آخر برنامج علاجي
+contact.profile.muac = محيط العضد
+contact.profile.nutrition_program = برنامج علاج التغذية
+contact.profile.nutrition_program.otp = البرنامج العلاجي للمرضى الخارجيين
+contact.profile.nutrition_program.sc = مركز إعادة التأهيل
+contact.profile.nutrition_program.sfp = برنامج التغذية التكميلية
+contact.profile.past_pregnancies = حالات الحمل السابقة
+contact.profile.pnc_visit = زيارات رعاية ما بعد الولادة مكتملة
+contact.profile.postnatal = رعاية ما بعد الولادة
+contact.profile.pregnancy = الحمل
+contact.profile.risk.high = عالي الخطورة
+contact.profile.risk.normal = طبيعي
+contact.profile.risk.title = الحالة
+contact.profile.sessions = عدد الجلسات
+contact.profile.visit = الزيارات المكتملة
+contact.profile.visits.of = {{count}} من {{total}}
+contact.profile.weight = الوزن (كغم)
+contact.profile.weight_at_exit = الوزن عند الخروج (كغم)
+contact.profile.wfa = الدرجة المعيارية للوزن بالنسبة للعمر
+contact.profile.wfh = الدرجة المعيارية للوزن بالنسبة للطول
+contact.select.error = خطأ في اختيار جهة الاتصال.
+contact.sex = الجنس
+contact.short = عامل صحي مجتمعي
+contact.type.clinic = المنطقة
+contact.type.clinic.edit = تعديل المنطقة
+contact.type.clinic.new = منطقة جديدة
+contact.type.clinic.plural = المناطق
+contact.type.district_hospital = المقاطعة
+contact.type.district_hospital.edit = تعديل المقاطعة
+contact.type.district_hospital.new = مقاطعة جديدة
+contact.type.district_hospital.plural = المقاطعات
+contact.type.health_center = مركز الصحة
+contact.type.health_center.edit = تعديل مركز الصحة
+contact.type.health_center.new = مركز صحة جديد
+contact.type.health_center.plural = مراكز الصحة
+contact.type.person = الشخص
+contact.type.person.edit = تعديل بيانات الشخص
+contact.type.person.new = شخص جديد
+contact.type.person.plural = الأشخاص
+contact.type.place.edit = تعديل المكان
+contact.type.place.new = مكان جديد
+contact.type.wrong = النوع خطأ، جهة الاتصال ليست شخصاً.
+contact.updated = تم تحديث جهة الاتصال
+contacts.imported = تم استيراد جهات الاتصال بنجاح
+contacts.results.sort = فرز النتائج
+contacts.results.sort.alpha = أبجدياً
+contacts.results.sort.date.last.visited = حسب تاريخ آخر زيارة
+contacts.results.sort.title = ترتيب هذه القائمة
+contacts.visits.count = {{count}}
+contacts.visits.visits = {VISITS, plural, one{زيارة} other{زيارات}}
+database_closed.description = حدث خطأ غير متوقع ويجب إعادة تحميل التطبيق.
+database_closed.title = خطأ غير متوقع
+date.from = مِن
+date.incorrect.advice = يُرجى تصحيح إعدادات التاريخ والوقت في جهازك.
+date.incorrect.confirm = موافق
+date.incorrect.description = يبدو أن التاريخ/الوقت مضبوطان بشكل غير صحيح على هذا الجهاز. ضبط التاريخ أو الوقت بشكل غير صحيح يعني أن بياناتك ستُتلف، وقد يعني أنك قد ستفقد المستهدفات.
+date.incorrect.expected = التاريخ المتوقع
+date.incorrect.reported = التاريخ المُبلّغ عنه
+date.incorrect.title = إعداد تاريخ خاطئ
+date.time.title = التاريخ والوقت
+date.to = إلى
+date_filter.error.from_date = لا يمكن أن يكون تاريخ "من" بعد تاريخ "إلى".
+date_filter.error.to_date = لا يمكن أن يكون تاريخ "إلى" قبل تاريخ "من".
+days = الأيام
+daysoverdue = الأيام منذ زيارة المريضـ(ـة)
+ddoc.version = مراجعة تطبيق الويب للخادم
+debug.db_info.docs = عدد المستندات
+debug.db_info.name = الاسم
+debug.db_info.seq = تحديث تسلسل
+debug.db_info.title = معلومات قاعدة البيانات
+debug.mode = تصحيح الأخطاء
+debug.mode.description = وضع تصحيح الأخطاء سيعرض معلومات في وحدة تحكم المتصفح من أجل مساعدة المطوِّرين في تشخيص مشاكل التطبيق. بعد تغيير هذا الإعداد، أعِد تحميل التطبيق لتطبيق التغيير.
+debug.mode.title = تمكين وضع تصحيح الأخطاء
+debug.supported_browser = المتصفح المدعوم
+debug.supported_browser.see_requirements = عرض المتطلبات
+denied = الطابع الزمني المرفوض
+display.language.accordion.title = ستكون اللغات الممكّنة متاحة للمستخدمين كخيار عند تحديد لغتهم الأساسية. ننصح باختيار لغة إلى 3 لغات مدعومة وتعطيل الباقي. من بين اللغات الممكّنة والمدعومة، يجب ألا تكون هناك ترجمات مفقودة.
+display.privacy.policies.content.type = نوع المحتوى
+display.privacy.policies.current = السياسة الحالية
+display.privacy.policies.delete = حذف
+display.privacy.policies.digest = الملخص
+display.privacy.policies.failure = حدث خطأ أثناء معالجة طلبك
+display.privacy.policies.name = اسم الملف المحلي
+display.privacy.policies.no.changes = لم يتم الكشف عن أي تغييرات.
+display.privacy.policies.preview = معاينة
+display.privacy.policies.preview.error = خطأ في تحميل المعاينة
+display.privacy.policies.preview.title = عرض سياسة الخصوصية للمعاينة للغة {{language}}
+display.privacy.policies.preview.wrong.type = نوع المحتوى خاطئ. يُرجى استخدام نص/HTML.
+display.privacy.policies.select = اختر ملف HTML
+display.privacy.policies.size = الحجم
+display.privacy.policies.submit.success = تم تحديث سياسات الخصوصية بنجاح
+display.privacy.policies.title = سياسات الخصوصية
+display.privacy.policies.update = تحديث السياسة
+display.privacy.policies.upload = اضغط على "إرسال" لتحميل التغييرات.
+display.translation.description = يُرجى ملاحظة أن أي تغييرات أو إضافات تجريها هنا على الترجمات لا يتم حفظها أو تعقبها في أي مكان آخر حالياً.
+district_hospital.field.children = مراكز الصحة
+district_hospital.field.contact = جهة اتصال رئيسية
+district_hospital.field.external_id = معرّف خارجي
+district_hospital.field.name = الاسم
+district_hospital.field.notes = ملاحظات
+document.deleted = تم حفظ السجل
+document.deleted.plural = عدد السجلات المحذوفة {{number}}
+edit.language.code.help.link = معيار ISO
+edit.language.description = من الأفضل أن تُدمَج أي لغات جديدة تُضاف في صُلب CHT، بحيث تصبح متاحة للشركاء الآخرين. لا تتردد في التواصل إذا كانت لديك أي استفسارات حول إضافة لغة جديدة.
+edit.name = تعديل الاسم
+edit.user.settings = إعدادات المستخدم
+edit_message_group.modal.title = تعديل الرسائل الصادرة
+email.invalid = عنوان البريد الإلكتروني غير صالح.
+empty = يبدو أنك أرسلت رسالة فارغة. يُرجى المحاولة مرة أخرى. إذا استمرت المشكلة، يُرجى التواصل مع المشرف.
+enketo.constraint.invalid = القيمة غير مسموح بها
+enketo.constraint.required = هذا الحقل مطلوب
+enketo.drawwidget.annotation = توضيح
+enketo.drawwidget.drawing = رسم
+enketo.drawwidget.signature = توقيع
+enketo.error.max_attachment_size = الملفات المرفوعة تتجاوز الحد الإجمالي للحجم. يُرجى رفع ملفات أصغر.
+enketo.form.required = مطلوب
+enketo.filepicker.file = ملف
+enketo.filepicker.placeholder = انقر هنا لتحميل الملف. (< {{maxSize}})
+enketo.filepicker.notFound = لم يتم العثور على الملف {{existing}} (اتركه بدون تغيير إذا تم تقديمه مسبقاً وتريد الاحتفاظ به).
+enketo.filepicker.waitingForPermissions = في انتظار أذونات المستخدم.
+enketo.filepicker.resetWarning = هذا الأمر سيؤدي إلى حذف {{item}}. هل تريد بالتأكيد القيام بذلك؟
+enketo.filepicker.toolargeerror = الملف كبير جداً (> {{maxSize}})
+enketo.geopicker.accuracy = الدقة (م)
+enketo.geopicker.altitude = الارتفاع (م)
+enketo.geopicker.closepolygon = أغلق المضلع
+enketo.geopicker.kmlcoords = إحداثيات KML
+enketo.geopicker.kmlpaste = الصق إحداثيات KML هنا
+enketo.geopicker.latitude = خط العرض (س.ص \B0)
+enketo.geopicker.longitude = خط الطول (س.ص \B0)
+enketo.geopicker.points = النقاط
+enketo.geopicker.searchPlaceholder = البحث عن مكان أو عنوان
+enketo.geopicker.removePoint = سيؤدي ذلك إلى حذف النقطة الجغرافية الحالية بالكامل من القائمة ولا يمكن التراجع عن ذلك. هل تريد بالتأكيد القيام بذلك؟
+enketo.selectpicker.noneselected = لا شيء محدد
+enketo.selectpicker.numberselected = تم تحديد {{number}}
+error.403.description = ليس لديك صلاحيات كافية لعرض هذه الصفحة. تحدث مع المسؤول لزيادة صلاحياتك.
+error.403.title = الوصول مرفوض
+error.404.description = الصفحة التي كنت تبحث عنها غير موجودة.
+error.404.title = غير موجودة
+error.503.description = خطأ في التحميل. تحقق من اتصالك بالإنترنت وحاول مرة أخرى أو تحقق مع المسؤول.
+error.503.title = خطأ
+error.file.size = يجب ألا يزيد حجم الملف عن {{size}}
+error.general.description = خطأ. يُرجى إعادة المحاولة.
+error.general.title = خطأ
+error.loading.form = خطأ في تحميل النموذج. يُرجى المحاولة مرة أخرى أو التحقق مع المسؤول.
+error.loading.form.no_contact = خطأ في تحميل النموذج. المستخدم ليس لديه جهة اتصال مرتبطة أو ليس لديه حق الوصول إلى جهة الاتصال المرتبطة. تحدّث إلى المسؤول لديك لتصحيح هذا الأمر.
+error.loading.form.no_authorized = خطأ في تحميل النموذج. المستخدم غير مصرح له بالوصول إلى هذا النموذج. تحدّث إلى المسؤول لديك لتصحيح هذا الأمر.
+error.report.save = خطأ في حفظ التقرير
+error.settings.loading = خطأ في تحميل الإعدادات. يُرجى المحاولة مرة أخرى.
+expected_date = التاريخ المتوقع
+export.button.download = تنزيل
+export.dhis.dataset.description = اختر من تكاملات DHIS2 المتوفرة.
+export.dhis.dataset.label = مجموعة بيانات DHIS2
+export.dhis.description = نزّل ملفاً يحتوي على بيانات DHIS2 DataValueSet للتكامل مع DHIS2.
+export.dhis.period.description = اختر من الفواصل الزمنية الشهرية المتاحة.
+export.dhis.period.label = فلترة حسب الفترة
+export.dhis.place.all = كل الأماكن
+export.dhis.place.description = فلتر البيانات المصدّرة لتشمل البيانات المرتبطة بجهات الاتصال ضِمن هذا المكان في التسلسل الهرمي.
+export.dhis.place.label = فلترة حسب المكان
+export.dhis.unconfigured = لم يتم تكوين تكامل DHIS2.
+export.feedback.description = نزّل سجل الأخطاء المكتشفة وملاحظات المستخدمين المرسَلة عبر ميزة ?Report bug?  بتنسيق CSV. يوضح الجدول أدناه أحدث التقارير المرسَلة.
+export.messages.description = نزّل جميع الرسائل التي تم إرسالها أو استلامها على الإطلاق بتنسيق CSV.
+export.people.description = نزّل جميع جهات الاتصال المسجلة في النظام بتنسيق JSON.
+export.reports.description = نزّل ملخص لجميع التقارير التي تم إرسالها على الإطلاق بتنسيق CSV.
+export.tabs.user_devices = أجهزة المستخدم
+export.user-devices.description = نزّل ملخصاً لإصدارات البرامج المتعلقة بـ CHT (المتصفح، ومثيل CHT، ونظام التشغيل) التي تعمل على أجهزة المستخدمين. 
+يتم تصدير الملخص بتنسيق JSON.
+extra_fields = حقول إضافية.
+android_app_launcher.button.launch = تشغيل التطبيق
+android_app_launcher.message.disable = لا تتوفر إمكانية تشغيل تطبيقات Android على هذا الجهاز.
+failed\ validation\ response\ message = أرسل رسالة الاستجابة التالية إذا
+fast_action_button.phone_call = اتصال
+fast_action_button.send_message = إرسال رسالة
+fast_action_button.title = جديد
+fast_action_button.update_facility = تحديث المرفق
+feedback.submitted = تم إرسال الملاحظات
+feedback.modal.submit = التقرير
+field\ digits\ only = {{field}} يجب أن يحتوي فقط على أرقام.
+field\ does\ not\ pass\ this\ validation = الحقل لا يجتاز عملية التحقق هذه
+field\ is\ required = {{field}} هو حقل مطلوب.
+fields = الحقول
+fields.one.required = أحد الحقول التالية مطلوب\: "{{fields}}"
+fields.required = الحقول المطلوبة المفقودة\: "{{fields}}"
+form = النموذج
+form_invalid = لم يتم إكمال النموذج '{{form}}' بشكل صحيح. يرجى إكماله وإعادة إرساله. إذا استمرت هذه المشكلة، اتصل بالمشرف لديك.
+form_invalid_custom = لم يتم إكمال النموذج '{{form}}' بشكل صحيح. يرجى إكماله وإعادة إرساله. إذا استمرت هذه المشكلة، اتصل بالمشرف لديك.
+form_not_found = لم يتم التعرف على النموذج المرسَل. يُرجى إكماله وإعادة إرساله. إذا استمرت هذه المشكلة، اتصل بالمشرف لديك.
+form_received = تم استلام إرسال النموذج. شكراً لك.
+forms.json = JSON
+forms.none.available = لا توجد نماذج متاحة حالياً.
+forms.xml = XML
+freetext.search = ابحث في كل شيء
+from = مِن
+generate.feedback.description = عدد مستندات الملاحظات المطلوب إنشاؤها\:
+generate.feedback.title = إنشاء مستندات الملاحظات
+health_center.field.children = المناطق
+health_center.field.contact = جهة اتصال رئيسية
+health_center.field.external_id = معرّف خارجي
+health_center.field.name = الاسم
+health_center.field.notes = ملاحظات
+health_center.field.parent = المقاطعة
+hours = ساعات
+icon = أيقونة
+icon.library = مكتبة أيقونات CHT
+icons = الأيقونات
+image = صورة
+images = صور
+images.header.tabs.icons = أيقونات علامات التبويب في الرأس
+images.header.tabs.icons.default = الأيقونة الافتراضية
+images.header.tabs.icons.description = قم بتكوين أيقونات علامة تبويب الرأس. يمكنك الاختيار بين أيقونات التطبيق بتنسيق svg. وأيقونات FontAwesome.
+images.header.tabs.icons.fa.icon = أيقونة FontAwesome
+images.header.tabs.icons.fontawesome.link = يُرجى قراءة المزيد عن FontAwesome.
+images.header.tabs.icons.request.error = خطأ في إحضار الإعدادات.
+images.header.tabs.icons.resource.icon = أيقونة المورد
+images.header.tabs.icons.submit.failure = خطأ في إرسال الإعدادات
+images.header.tabs.icons.submit.success = تم الإرسال بنجاح
+images.header.tabs.icons.tab = علامة تبويب
+images.icons.description = يتم استخدام الصور التي تم تحميلها هنا في جميع أنحاء التطبيق في أماكن مختلفة على النحو المحدد في رمز التطبيق. على سبيل المثال، يتم تحديد الصورة التي تظهر لأداة معينة في صفحة المستهدفات داخل رمز المستهدف. يمكنك تحميل الصور واحدة تلو الأخرى. وإذا حمّلت صورة تحمل نفس اسم صورة موجودة، فسيتم استبدالها بالملف الجديد. يُنصح أن تكون الصور بصيغة svg. أو png. وأن يكون حجمها أقل من 500 كيلوبايت. الموارد متاحة في
+images.partners.description = أي شعارات لشريك تُضاف هنا ستظهر في صفحة "حول" في التطبيق.
+import.export = استيراد وتصدير البيانات
+initial.replication.duration = المدة
+initial.replication.status = الحالة
+initial.replication.status.complete = إكمال
+initial.replication.status.failed = فشل
+initial.replication.status.in_progress = قيد التنفيذ
+initial.replication.status.pending = معلّق
+initial.replication.title = التكرار الأولي
+instance.stage.complete = تم الانتهاء من الإعداد. قم بالتثبيت عندما تكون جاهزاً.
+instance.stage.confirm = تأكيد الإعداد
+instance.stage.confirm.note = ملاحظة\: أنت تقوم بإعداد هذا النشر، ويعني هذا أنه سيتم تنفيذ أكبر قدر ممكن من العمل في الخلفية لتحضير عملية التثبيت بدون مقاطعة المستخدمين. لن يتم النشر حتى تُجري عملية النشر بعد اكتمال الإعداد.
+instance.stage.deployment = جارٍ إعداد النشر
+instance.upgrade = الترقيات
+instance.upgrade.at = تشغيل
+instance.upgrade.betas = النسخ التجريبية
+instance.upgrade.branches = الفروع
+instance.upgrade.build.version = الإصدار
+instance.upgrade.cancel = إلغاء الترقية
+instance.upgrade.cancelling = جارٍ إلغاء الترقية
+instance.upgrade.cancel.note = سيؤدي الإلغاء إلى إيقاف الترقية الحالية وإعادة ضبط أي تقدم أُحرز أثناء الإعداد.
+instance.upgrade.cancel.summary = أنت على وشك إلغاء الترقية من {{before}} إلى {{after}}.
+instance.upgrade.complete = اكتمل النشر.
+instance.upgrade.confirm = تأكيد الترقية
+instance.upgrade.confirming = جارٍ تأكيد الترقية
+instance.upgrade.confirm.summary = أنت على وشك الترقية من {{before}} إلى {{after}}.
+instance.upgrade.confirm.warning.text = لا يمكن التراجع عن هذا الإجراء. تأكد من نسخ بياناتك احتياطياً\!
+instance.upgrade.current_version = الإصدار الحالي
+instance.upgrade.date = تاريخ الإصدار
+instance.upgrade.deployed_by = تم النشر بواسطة
+instance.upgrade.deployment = النشر قيد التقدم
+instance.upgrade.error.abort = خطأ أثناء إلغاء الترقية
+instance.upgrade.error.deploy = خطأ أثناء تشغيل التحديث
+instance.upgrade.error.deploy_info_fetch = خطأ أثناء إحضار معلومات النشر
+instance.upgrade.error.get_upgrade = خطأ أثناء إحضار تقدم الترقية
+instance.upgrade.error.version_fetch = خطأ أثناء جلب الإصدارات المتاحة
+instance.upgrade.feature_releases = الإصدارات التجريبية من الميزات
+instance.upgrade.install = تثبيت
+instance.upgrade.interrupted = تسبب خطأ غير متوقع في الخادم في انقطاع الترقية.
+instance.upgrade.no_betas = لا توجد إصدارات تجريبية جديدة يمكنك الترقية إليها.
+instance.upgrade.no_branches = لا توجد فروع إصدارات متاحة.
+instance.upgrade.no_details = (التفاصيل غير متوفرة)
+instance.upgrade.no_feature_releases = لا توجد إصدارات ميزات جديدة يمكنك الترقية إليها.
+instance.upgrade.no_horti = Horticulturalist مطلوب
+instance.upgrade.no_horti.detail = لاستخدام هذه الصفحة، يجب نشر المثيل الخاص بك عبر Horticulturalist.
+instance.upgrade.no_new_releases = لا توجد إصدارات جديدة يمكنك الترقية إليها.
+instance.upgrade.potentiallyIncompatible = قد يكون هذا الإصدار غير متوافق مع الإصدار الحالي لديك.
+instance.upgrade.releases = الإصدارات
+instance.upgrade.retry = إعادة محاولة الترقية
+instance.upgrade.stage = الإعداد
+instance.upgrade.state.completing = جارٍ إكمال الترقية
+instance.upgrade.state.complete = الترقية مكتملة
+instance.upgrade.state.finalizing = جارٍ إنهاء الترقية
+instance.upgrade.state.initiated = تم بدء الترقية
+instance.upgrade.state.staged = تم إعداد الترقية
+instance.upgrade.state.indexing = جارٍ فهرسة طرق العرض المُعدّة
+instance.upgrade.state.indexed = اكتملت الفهرسة
+instance.upgrade.state.interrupted = منقطع
+instance.upgrade.upgrading = تم بدء ترقية من {{before}} إلى {{after}}.
+instance.upgrade.version = الإصدار
+instance.upgrade.pre_releases = الإصدارات التجريبية
+instance.upgrade.pre_releases_warning = الإصدارات في هذا القسم غير آمنة للنشر في بيئات الإنتاج.
+invalid.query = هذا الاستعلام غير صالح. يُرجى الاطّلاع على صفحة مساعدة البحث المتقدم للحصول على مزيد من المعلومات حول بناء جملة الاستعلام.
+login = تسجيل الدخول
+login.error = حدث خطأ غير متوقع أثناء تسجيل الدخول. يُرجى إعادة المحاولة.
+login.hide_password = إخفاء كلمة المرور
+login.incorrect = اسم المستخدم أو كلمة المرور غير صحيحة. يُرجى إعادة المحاولة.
+login.show_password = إظهار كلمة المرور
+login.token.expired = انتهت صلاحية الرابط. اتصل بالمسؤول لتلقي رابط جديد.
+login.token.general.error = حدث خطأ أثناء معالجة طلبك. يُرجى إعادة المحاولة. إذا حدث هذا مرة أخرى، فاتصل بالمسؤول لتلقي رابط جديد.
+login.token.invalid = الرابط الخاص بك غير صالح. اتصل بالمسؤول لتلقي رابط جديد.
+login.token.loading = جارٍ تسجيل دخولك. يرجى الانتظار.
+login.token.missing = الرابط لا يحتوي على المعلومات المطلوبة. اتصل بالمسؤول لتلقي رابط جديد.
+login.token.redirect.login = صفحة تسجيل الدخول
+login.token.redirect.login.info = إذا كنت تعرف اسم المستخدم وكلمة المرور الخاصين بك، انقر على الرابط التالي لتحميل صفحة تسجيل الدخول.
+login.token.timeout = انتهت مهلة المحاولة لتسجيل الدخول. يُرجى إعادة المحاولة. إذا حدث هذا مرة أخرى، فاتصل بالمسؤول لتلقي رابط جديد.
+login.unsupported_browser = للحصول على تجربة أفضل في التطبيق، يُرجى الاتصال بالمسؤول أو المشرف لديك.
+login.unsupported_browser.outdated_cht_android = اطلب منهم تحديث cht-android.
+login.unsupported_browser.outdated_webview_apk = اطلب منهم تحديث ملف APK الخاص بـ WebView.
+login.unsupported_browser.outdated_browser = اطلب منهم تحديث متصفحك.
+message.characters.left = عدد الحروف المتبقي {{characters}}
+message.characters.left.multiple = عدد رسائل SMS‏ {{messages}}، عدد الحروف المتبقية {{characters}}
+message.characters.left.multiple.many = عدد رسائل SMS‏ {{messages}}، عدد الحروف المتبقية {{characters}} - عدد الرسائل كبير جداً\!
+message.list.complete = لم يتم العثور على المزيد من الرسائل
+messages.c.report_accepted = شكراً لك  {{contact.name}} لتسجيل {{patient_name}}. المعرّف هو {{patient_id}}. تم تسجيلهم في الجدول الزمني لصحة الطفل.
+messages.c.validation.months_since_birth = صيغة التسجيل لـ {{patient_id}} غير صحيحة. يُرجى التأكد من أن العمر مُحدد بالأشهر ويتراوح بين 0 و59.
+messages.c.validation.patient_name = {{\#patient_name}}تنسيق التسجيل غير صحيح. ابدأ بحرف C متبوعاً بمسافة، والعمر بالأسابيع متبوعاً بمسافة، واسم الطفل (بحد أقصى 30 حرفاً).{{/patient_name}}{{^patient_name}}.لا يحتوي نموذج التسجيل على اسم. ابدأ بحرف C متبوعاً بمسافة، ثم العمر بالأسابيع متبوعاً بمسافة، ثم اسم الطفل{{/patient_name}}.
+messages.c.validation.weeks_since_birth = صيغة التسجيل لـ {{patient_id}} غير صحيحة. يُرجى التأكد من أن العمر مُحدد بالأسابيع ويتراوح بين 0 و260.
+messages.d.report_accepted = شكراً لك {{contact.name}} على الإبلاغ عن ولادة {{patient_name}} ({{patient_id}}).
+messages.d.validation.days_since_birth = تقرير ولادة {{patient_id}} غير صحيح. يُرجى التأكد من أن عدد الأيام منذ الولادة هو عدد أيام يتراوح بين 0 و365، أو تركه فارغاً.
+messages.d.validation.delivery_code = {{#delivery_code}} لم يتم فهم رمز الولادة. يُرجى استخدام الرمز 'F' للمرفق، و'S' للولادة في المنزل بمساعدة قابِلة ماهرة، و'NS' للولادة بدون مساعدة قابِلة ماهرة.{{/delivery_code}}{{^delivery_code}}كان رمز الولادة مفقوداً. يُرجى استخدام الرمز 'F' للمرفق، و'S' للولادة في المنزل بمساعدة قابِلة ماهرة، و'NS' للولادة بدون مساعدة قابِلة ماهرة.{{/delivery_code}}
+messages.errors.invalid = رسالة غير صالحة\:
+messages.errors.message.empty = الترجمة مفقودة
+messages.errors.patient.missing = لم يتم العثور على المريضـ(ـة)
+messages.errors.place.missing = لم يتم العثور على المكان
+messages.errors.unknown.contact = جهة الاتصال هذه لم تعد موجودة، ولا يمكنك إرسال رسالة إليها.
+messages.f.report_accepted = شكراً لك على الإبلاغ عن {{patient_name}} ({{patient_id}}). إذا كانت هذه حالة طارئة، يرجى إحالتها إلى العيادة فوراً.
+messages.f.report_accepted_parent = تم الإبلاغ عن {{patient_name}} ({{patient_id}}) من قِبل {{contact.name}} ({{contact.phone}}) لمزيد من المتابعة.
+messages.generic.no_provided_patient_id = تم تكوين دعم رقم المعرّف الخارجي، ولكن لا يمكن العثور عليه في المستند في الموقع الذي تم تكوينه.
+messages.generic.provided_patient_id_not_unique = رقم المعرّف المقدم مستخدَم بالفعل.
+messages.generic.provided_phone_not_valid = رقم الهاتف المقدّم غير صالح.
+messages.generic.registration_accepted = شكراً لك  {{contact.name}} لتسجيل {{patient_name}}. المعرّف هو {{patient_id}}.
+messages.generic.registration_not_found = لم يتم العثور على شخص يحمل رقم المعرّف '{{patient_id}}'. تحقّق من المعرّف وأعد إرسال الرسالة.
+messages.generic.report_accepted = شكراً لك {{contact.name}}، تم تسجيل {{form}} لـ {{patient_name}} ({{patient_id}}).
+messages.generic.sys.facility_not_found = لم يتم تسجيلك لاستخدام هذا التطبيق.
+messages.generic.validation.patient_id = {{\#patient_id}}رقم المعرّف المقدّم غير صحيح، ويجب أن يتكوّن من 5 إلى 13 رقماً. يُرجى إرسال معرّف صالح.{{/patient_id}}{{^patient_id}}تنسيق الرسالة غير صحيح. يرجى التأكد من إرسال رسالة تبدأ بـ {{form}} متبوعة بمسافة ثم معرّف الشخص.{{patient_id}}
+messages.m.report_accepted = شكراً لك {{contact.name}}، تم تسجيل زيارة بعد الولادة لِـ {{patient_name}} ({{patient_id}}).
+messages.n.report_accepted = شكراً لك  {{contact.name}} لتسجيل {{patient_name}}. المعرّف هو {{patient_id}}. إذا كانت المرأة حاملاً، يرجى تسجيلها في الرسالة السابقة للولادة باستخدام النموذج P.
+messages.n.validation.patient_name = {{\#patient_name}}تنسيق التسجيل غير صحيح. لذا تأكّد من أن الرسالة تبدأ بحرف N متبوعاً بمسافة واسم الشخص (بحد أقصى 30 حرفاً).{{/patient_name}}{{^patient_name}}تنسيق التسجيل غير صحيح. لذا تأكّد من أن الرسالة تبدأ بحرف N متبوعاً بمسافة واسم الشخص.{{/patient_name}}.
+messages.off.report_accepted = لن يتم إرسال أي إشعارات أخرى بخصوص {{patient_name}} حتى تُرسل 'ON {{patient_id}}'.{{\#chw_sms}} {{chw_sms}}{{/chw_sms}}
+messages.on.report_accepted = تمت إعادة تنشيط الإشعارات الخاصة بـ  {{patient_name}} ({{patient_id}}).{{\#chw_sms}} {{chw_sms}}{{/chw_sms}}
+messages.p.report_accepted = شكراً لك على تسجيل الحمل لِـ {{patient_name}} ({{patient_id}}).{{\#expected_date}} تاريخ الولادة المتوقع هو {{\#date}}{{expected_date}}{{/date}}{{/expected_date}}
+messages.p.validation.last_menstrual_period = تنسيق التسجيل لـ {{patient_name}} غير صحيح. يرجى التأكد من أن الدورة الشهرية الأخيرة هو رقم بين 2 و42.
+messages.relay.chw_sms = {{\#chw_sms}}{{chw_sms}}{{/chw_sms}}
+messages.schedule.anc.checkin = أين وضعت {{patient_name}} مولودها؟ أجب باستخدام 'D {{patient_id}} F'‏ للولادة في المرفق، و'D {{patient_id}} S' للولادة بمساعدة قابِلة ماهرة، و'D {{patient_id}} NS' للولادة في المنزل بدون مساعدة قابِلة ماهرة.
+messages.schedule.anc.followup = هل حضر(ت) {{patient_name}} زيارة الرعاية السابقة للولادة؟ عندما تفعل ذلك، يُرجى الرد بـ 'V {{patient_id}}'. شكراً لك\!
+messages.schedule.anc.reminder = يرجى تذكير {{patient_name}} ({{patient_id}}) بزيارة مرفق الصحة لإتمام زيارة الرعاية السابقة للولادة هذا الأسبوع. عندما تقوم بهذه الخطوة، يُرجى إعلامنا بذلك باستخدام 'V {{patient_id}}'. شكراً\!
+messages.schedule.anc.reminder_due = يجب على {{patient_name}} ({{patient_id}}) إجراء زيارة الرعاية السابقة للولادة هذا الأسبوع. يرجى التأكيد برسالة 'V'. إذا كانت قد وضعت مولودها، يُرجى إرسال رسالة "D".
+messages.schedule.anc.week_38 = {{patient_name}} ({{patient_id}}) حامل في الأسبوع الـ 38 وستلد قريباً. يرجى إحالتها إلى مرفق الصحة.
+messages.schedule.anc.week_40 = {{patient_name}} ({{patient_id}}) حامل في الأسبوع الـ 40 وستلد قريباً. يرجى إحالتها إلى مرفق الصحة.
+messages.schedule.child.month_01 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_02 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_03 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_04 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_05 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_06 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_07 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_08 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_09 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_10 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_11 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_12 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_13 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_14 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_15 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_16 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_17 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_18 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_19 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_20 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_21 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_22 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_23 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_24 = يرجى زيارة {{patient_name}} {{patient_id}}  للتذكير بالتطعيمات الواجبة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_25 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_26 = يُرجى زيارة {{patient_name}} {{patient_id}} للتأكد من الحصول على التطعيمات اللازمة + التحقق من علامات اعتلال الصحة. شكراً لك\!
+messages.schedule.child.month_27 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_28 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_29 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_30 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_31 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_32 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_33 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_34 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_35 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_36 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_37 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_38 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_39 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_40 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_41 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_42 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_43 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_44 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_45 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_46 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_47 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_48 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_49 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_50 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_51 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_52 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_53 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_54 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_55 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_56 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_57 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_58 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_59 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.child.month_60 = يُرجى زيارة {{patient_name}} {{patient_id}} للتحقق من علامات اعتلال الصحة. راجع مرفق الصحة إذا لزم الأمر. شكراً لك\!
+messages.schedule.imm.checkin = يُرجى زيارة {{patient_name}} ({{patient_id}}) لتذكيرها بالتطعيمات الواجبة . يرجى الإبلاغ عن أي لقاحات جديدة تم تلقيها. شكراً لك\!
+messages.schedule.imm.followup = هل حضر(ت) {{patient_name}} ({{patient_id}}) الموعد لتلقي التطعيمات؟ عندما تفعل ذلك، يرجى الإبلاغ عن التطعيمات التي تم تلقيها. شكراً لك\!
+messages.schedule.imm.reminder = يرجى تذكير {{patient_name}} ({{patient_id}}) بحضور موعد التطعيمات هذا الأسبوع. عندما تفعل ذلك، يرجى الإبلاغ عن التطعيمات التي تم تلقيها. شكراً لك\!
+messages.schedule.postnatal.day_0 = يرجى متابعة {{patient_name}} ({{patient_id}}) للتأكد من حضورها زيارة ما بعد الولادة في اليوم 0 غداً. عندما تفعل ذلك، أخبرنا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.day_0_overdue = هل حضر(ت) {{patient_name}} ({{patient_id}}) زيارة ما بعد الولادة في اليوم 0؟ أخبرونا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.day_3 = يرجى متابعة {{patient_name}} ({{patient_id}}) للتأكد من حضورها زيارة ما بعد الولادة في اليوم 3 غداً. عندما تفعل ذلك، أخبرنا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.day_3_overdue = هل حضر(ت) {{patient_name}} ({{patient_id}}) زيارة ما بعد الولادة في اليوم 3؟ أخبرونا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.day_7 = يرجى متابعة {{patient_name}} ({{patient_id}}) للتأكد من حضورها زيارة ما بعد الولادة في اليوم 7 غداً. عندما تفعل ذلك، أخبرنا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.day_7_overdue = هل حضر(ت) {{patient_name}} ({{patient_id}}) زيارة ما بعد الولادة في اليوم 7؟ أخبرونا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.week_6 = يرجى متابعة {{patient_name}} ({{patient_id}}) للتأكد من حضورها زيارة ما بعد الولادة في الأسبوع 6 هذا الأسبوع. عندما تفعل ذلك، أخبرنا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.postnatal.week_6_overdue = هل حضر(ت) {{patient_name}} ({{patient_id}}) زيارة ما بعد الولادة في الأسبوع 6؟ أخبرونا بـ 'M {{patient_id}}'. شكراً\!
+messages.schedule.registration.followup_anc = مرحباً {{contact.name}}، يُرجى تذكر تقديم تسجيل الحمل لِـ {{patient_name}} {{patient_id}} مع 'P {{patient_id}} <الأسابيع بعد الدورة الشهرية الأخيرة>'. شكراً\!
+messages.schedule.registration.followup_anc_pnc = {{contact.name}}، هل احتاجت {{patient_name}} ({{patient_id}}) إلى الرعاية؟ لتسجيل الحمل، أرسل 'P {{patient_id}} <الأسابيع بعد الدورة الشهرية الأخيرة>'. لرعاية ما بعد الولادة، أرسل تقرير الولادة باستخدام الصيغة 'D {{patient_id}} <Delivery Code> <Days Since Delivery>'. شكراً لك\!
+messages.sent.by = تم الإرسال من قِبَل {{senderName}}
+messages.unknown.sender = المرسِل غير معروف
+messages.v.report_accepted = شكراً لك {{contact.name}}، تمت تسجيل زيارة {{patient_name}} ({{patient_id}}).
+metadata = بيانات التعريف
+minutes = الدقائق
+missing_fields = حقول مفقودة أو غير صالحة\: {{fields}}.
+month = شهر
+month.plural = أشهر
+months = أشهر
+mother_outcome = حصيلة صحة الأم
+mrdt.disabled = تطبيق MRDT غير متوفر على هذا الجهاز.
+mrdt.verify = التقاط صورة
+muted = طابع زمني معطل
+n.month = {MONTHS, plural, one{1 month} other{\# months}}
+n.week = {WEEKS, plural, one{1 week} other{\# weeks}}
+no = لا
+number.bytes = {{number}} بايت
+number.seconds = {{number}} ثانية
+number\ errors = واجهنا {{number}} أخطا\:
+number\ records = عدد السجلات {{number}}
+online.action.message = هذا الإجراء يتطلب اتصالاً بالإنترنت. يرجى المحاولة مرة أخرى عند توفر الشبكة.
+online.action.title = يرجى التأكد من الاتصال بالإنترنت.
+overwrite.existing.records.help = إذا تم تحديد هذا الخيار، فسيتم تحديث جهات الاتصال التي تم تحميلها إذا كانت موجودة بالفعل في قاعدة البيانات. وإذا لم يتم تحديده، فسيتم تجاوزها.
+partner.logo.field = شعار الشريك
+partner.logo.upload = تحميل شعار الشريك
+partner.name.field = اسم الشريك
+partner.supporting = الشركاء الداعمون
+partner.tab.partners = الشركاء
+password.incorrect = كلمة المرور غير صحيحة.
+password.length.minimum = يجب أن تكون كلمة المرور مؤلفة على الأقل من {{minimum}} حرفاً.
+password.update = تحديث كلمة المرور
+password.weak = كلمة المرور سهلة جداً ليتم تخمينها. يرجى تضمين مجموعة متنوعة من الحروف لجعلها أكثر تعقيداً.
+patient\ id\ not\ found\ response = يُرجى إرسال الرسالة التالية إذا اجتازت جميع عمليات التحقق ولكن لم يتم العثور على معرّف المريضـ(ـة).
+patient_id = معرّف المريضـ(ـة)
+pending = الطابع الزمني معلّق
+people = الأشخاص
+permission = الإذن
+permission.description.can_access_gateway_api = السماح بالوصول إلى واجهات برمجة التطبيقات للعمل كبوابة رسائل SMS.
+permission.description.can_aggregate_targets = السماح بالاطّلاع على صفحة المجاميع المستهدفة
+permission.description.can_bulk_delete_reports = السماح باستخدام وظائف الحذف المجمّع لحذف تقارير متعددة.
+permission.description.can_configure = يسمح بتهيئة جميع تكوينات التطبيق.
+permission.description.can_create_people = السماح بإنشاء أشخاص جدد.
+permission.description.can_create_places = السماح بإنشاء أماكن جديدة.
+permission.description.can_create_records = السماح بالوصول إلى واجهات برمجة التطبيقات لإنشاء التقارير.
+permission.description.can_create_users = السماح بإنشاء مستخدمين.
+permission.description.can_delete_contacts = السماح بحذف الأشخاص والأماكن.
+permission.description.can_delete_messages = السماح بحذف الرسائل.
+permission.description.can_delete_reports = السماح بحذف التقارير.
+permission.description.can_delete_users = السماح بحذف المستخدمين.
+permission.description.can_edit = السماح بإنشاء المستندات وتعديلها في قاعدة البيانات.
+permission.description.can_edit_profile = السماح بتعديل إعدادات المستخدم الخاصة بهم.
+permission.description.can_edit_verification = السماح بتحديث حالات التحقق من التقارير.
+permission.description.can_export_all = السماح بتصدير جميع البيانات حتى لو لم يكن لديهم الإذن عادةً لعرضها.
+permission.description.can_export_contacts = السماح بتصدير جميع جهات الاتصال.
+permission.description.can_export_feedback = السماح بتصدير جميع ملاحظات المستخدمين.
+permission.description.can_export_messages = السماح بتصدير جميع التقارير والرسائل.
+permission.description.can_log_out_on_android = السماح بتسجيل الخروج من تطبيق أندرويد.
+permission.description.can_update_places = السماح بتحديث مستندات الأماكن الحالية.
+permission.description.can_update_reports = السماح بتحديث مستندات التقارير الحالية.
+permission.description.can_update_users = السماح بتحديث المستخدمين الحاليين.
+permission.description.can_verify_reports = السماح بتعيين حالات التحقق من التقرير إذا لم يتم تعيين أي حالة في الوقت الحالي.
+permission.description.can_view_analytics = السماح بعرض التحليلات.
+permission.description.can_view_analytics_tab = عرض علامة تبويب التحليلات في التطبيق. إذا لم يتم تعيينها سيتم عرض عنصر قائمة في قائمة التطبيق بدلاً من ذلك.
+permission.description.can_view_call_action = عرض زر لبدء مكالمة مع الشخص المحدد.
+permission.description.can_view_contacts = السماح بعرض جهات الاتصال.
+permission.description.can_view_contacts_tab = عرض علامة تبويب جهات الاتصال في التطبيق. وإذا لم يتم تعيينها، فسيتم عرض عنصر قائمة في قائمة التطبيق بدلاً من ذلك.
+permission.description.can_view_last_visited_date = عرض تاريخ آخر زيارة في قائمة جهات الاتصال.
+permission.description.can_view_uhc_stats = السماح بعرض إحصائيات التغطية الصحية الشاملة في ملخص جهات الاتصال.
+permission.description.can_view_message_action = عرض زر لإرسال رسالة إلى الشخص المحدد.
+permission.description.can_view_messages = السماح بعرض الرسائل.
+permission.description.can_view_messages_tab = عرض علامة تبويب الرسائل في التطبيق. وإذا لم يتم تعيينها، فسيتم عرض عنصر قائمة في قائمة التطبيق بدلاً من ذلك.
+permission.description.can_view_old_navigation = السماح بعرض شريط التنقل القديم.
+permission.description.can_view_outgoing_messages = السماح بعرض شاشة الرسائل الصادرة في تطبيق المسؤول.
+permission.description.can_view_reports = السماح بعرض التقارير.
+permission.description.can_view_reports_tab = عرض علامة تبويب التقارير في التطبيق. وإذا لم يتم تعيينها، فسيتم عرض عنصر قائمة في قائمة التطبيق بدلاً من ذلك.
+permission.description.can_view_tasks = السماح بعرض المهام.
+permission.description.can_view_tasks_group = السماح بعرض صفحة المهام للأسرة.
+permission.description.can_view_tasks_tab = عرض علامة تبويب المهام في التطبيق. وإذا لم يتم تعيينها، فسيتم عرض عنصر قائمة في قائمة التطبيق بدلاً من ذلك.
+permission.description.can_view_unallocated_data_records = السماح بالاطّلاع على التقارير التي لم يتم تعيين جهة اتصال لها.
+permission.description.can_view_users = السماح بالحصول على قائمة بجميع المستخدمين المهيئين.
+permission.description.can_write_wealth_quintiles = السماح بتحديث جهات الاتصال بخُمس ثرواتهم.
+permission.description.can_upgrade = السماح بترقية إصدار CHT Core Framework عبر واجهة برمجة التطبيقات أو واجهة الإدارة.
+permission.description.can_have_multiple_places.not_allowed = الأدوار المحددة ليس لديها إذن لتعيين أماكن متعددة.
+permission.description.can_have_multiple_places.incompatible_place = يجب أن تكون الأماكن المحددة من نفس النوع (أن تكون في نفس مستوى التسلسل الهرمي).
+permissions = الأذونات
+person.field.alternate_phone = رقم هاتف بديل
+person.field.code = الرمز
+person.field.date_of_birth = تاريخ الميلاد
+person.field.first_name = الاسم الأول
+person.field.last_name = اسم العائلة
+person.field.name = الاسم
+person.field.national_id_number = رقم الهوية الوطنية
+person.field.notes = ملاحظات
+person.field.parent = المنطقة
+person.field.phone = رقم الهاتف
+person.field.title = العنوان
+phone\ number\ not\ unique = هذا الرقم مسجل بالفعل لجهة الاتصال {{name}}
+place.deleted = [محذوف]
+place.unavailable = [غير متاح]
+privacy.policy = سياسة الخصوصية
+privacy.policy.accept = قبول
+privacy.policy.not.found = سياسة الخصوصية غير موجودة
+purge.description = قم بتشغيل فحص فوراً لإزالة المستندات المحلية المؤهلة.
+purge.title = إزالة
+quarter = الربع
+quarter.plural = الأرباع
+received = الطابع الزمني المُستلَم
+registrant = المسجِّل
+registrants\ supervisor = مشرف المسجِّل
+registration\ date = تاريخ التسجيل
+related_entities.clinic.contact.name = اسم جهة اتصال المنطقة
+related_entities.clinic.external_id = معرّف المنطقة الخارجية
+related_entities.clinic.name = اسم المنطقة
+related_entities.clinic.parent.contact.name = اسم جهة الاتصال بمركز الصحة
+related_entities.clinic.parent.external_id = المعرّف الخارجي لمركز الصحة
+related_entities.clinic.parent.name = اسم مركز الصحة
+related_entities.clinic.parent.parent.external_id = المعرّف الخارجي للمقاطعة
+related_entities.clinic.parent.parent.name = اسم المقاطعة
+related_entities.health_center.contact.name = اسم جهة الاتصال بمركز الصحة
+related_entities.health_center.name = اسم مركز الصحة
+related_entities.health_center.parent.name = اسم المقاطعة
+reload.app = إعادة تحميل التطبيق
+replication.disabled = معطّل للمسؤولين
+replication.last.success.from = آخر نسخ متماثل ناجح من الخادم
+replication.last.success.to = آخر نسخ متماثل ناجح إلى الخادم
+replication.last.success.unknown = غير معروف
+report.child_health_registration.birth_date = تاريخ الولادة
+report.child_health_registration.chw_name = اسم العامل الصحي المجتمعي
+report.child_health_registration.chw_phone = رقم هاتف العامل الصحي المجتمعي
+report.child_health_registration.chw_sms = ملاحظة إلى العامل الصحي المجتمعي
+report.child_health_registration.patient_id = المعرّف
+report.child_health_registration.patient_name = الاسم
+report.clinic_visit.title.sms = زيارة العيادة (رسالة SMS)
+report.content.raw = محتوى التقرير الأولي
+report.created = التقرير المقدم
+report.delivery.birth_date = تاريخ الميلاد
+report.delivery.chw_name = اسم العامل الصحي المجتمعي
+report.delivery.chw_phone = رقم هاتف العامل الصحي المجتمعي
+report.delivery.chw_sms = ملاحظة إلى العامل الصحي المجتمعي
+report.delivery.delivery_code = رمز الولادة
+report.delivery.delivery_code_label = موقع الولادة
+report.delivery.delivery_date = تاريخ الولادة
+report.delivery.label_delivery_code = موقع الولادة
+report.delivery.label_pregnancy_outcome = حصيلة الحمل
+report.delivery.patient_id = المعرّف
+report.delivery.patient_name = الاسم
+report.delivery.pregnancy_outcome = حصيلة الحمل
+report.delivery.pregnancy_outcome_label = حصيلة الحمل
+report.delivery.title.sms = تقرير الولادة (رسالة SMS)
+report.edit = تعديل التقرير
+report.flag.title.sms = إشارة علامة الخطر (رسالة SMS)
+report.new_report.button = تقرير جديد
+report.new_child.title.sms = تسجيل طفل جديد + تسجيل تطعيم (رسالة SMS)
+report.new_person.title.sms = شخص جديد (رسالة SMS)
+report.new_pregnancy.title.sms = حمل جديد (رسالة SMS)
+report.off.title.sms = إيقاف تشغيل الإشعارات (رسالة SMS)
+report.on.title.sms = تشغيل الإشعارات (رسالة SMS)
+report.postnatal_visit.chw_name = اسم العامل الصحي المجتمعي
+report.postnatal_visit.chw_phone = رقم هاتف العامل الصحي المجتمعي
+report.postnatal_visit.chw_sms = ملاحظة إلى العامل الصحي المجتمعي
+report.postnatal_visit.danger_signs_baby = علامات الخطر على الطفل الرضيع
+report.postnatal_visit.danger_signs_mom = علامات خطر على الأم
+report.postnatal_visit.patient_id = المعرّف
+report.postnatal_visit.patient_name = الاسم
+report.postnatal_visit.referral_follow_up_needed_baby = متابعة الإحالة المطلوبة للطفل الرضيع
+report.postnatal_visit.referral_follow_up_needed_mom = متابعة الإحالة المطلوبة للأم
+report.postnatal_visit.visit_confirmed = تم تأكيد الزيارة
+report.pregnancy.chw_name = اسم العامل الصحي المجتمعي
+report.pregnancy.chw_phone = رقم هاتف العامل الصحي المجتمعي
+report.pregnancy.chw_sms = ملاحظة إلى العامل الصحي المجتمعي
+report.pregnancy.danger_signs = علامات الخطر
+report.pregnancy.edd = تاريخ الولادة المتوقع
+report.pregnancy.lmp_date = تاريخ الدورة الشهرية الأخيرة
+report.pregnancy.patient_id = المعرّف
+report.pregnancy.patient_name = الاسم
+report.pregnancy.risk_factors = عوامل الخطر
+report.pregnancy_visit.chw_name = اسم العامل الصحي المجتمعي
+report.pregnancy_visit.chw_phone = رقم هاتف العامل الصحي المجتمعي
+report.pregnancy_visit.chw_sms = ملاحظة إلى العامل الصحي المجتمعي
+report.pregnancy_visit.danger_signs = علامات الخطر
+report.pregnancy_visit.patient_id = المعرّف
+report.pregnancy_visit.patient_name = الاسم
+report.pregnancy_visit.referral_follow_up_needed = متابعة الإحالة المطلوبة
+report.pregnancy_visit.visit_confirmed = تم تأكيد الزيارة
+reports.sidebar.filter.date = التاريخ
+reports.sidebar.filter.from_date = مِن
+reports.sidebar.filter.form_type = نوع النموذج
+reports.sidebar.filter.place = المكان
+reports.sidebar.filter.reset = إعادة ضبط
+reports.sidebar.filter.status = الحالة
+reports.sidebar.filter.submit = تطبيق
+reports.sidebar.filter.title = الفلتر
+reports.sidebar.filter.to_date = إلى:
+report.subject.unknown = موضوع غير معروف
+report.updated = تم تحديث التقرير
+reported_date = التاريخ المُبلّغ عنه
+reporter.link = انتقل إلى Medic Reporter
+reporter.section.help = استخدم برنامج Medic Reporter لاختبار نماذج رسائل SMS.
+reporter.section.title = Medic Reporter
+reporting_unit_not_found = معرّف وحدة الإبلاغ غير صحيح. يرجى التصحيح وتقديم تقرير كامل مرة أخرى.
+reports.none = لم يتم العثور على أي تقارير.
+reports.none.n.months = {MONTHS, plural, one{No reports in the last month.} other{No reports in the last \# months.}}
+reports.verify = المراجعة
+reports.verify.invalid = يحتوي على أخطاء
+reports.verify.valid = صحيح
+responses = الاستجابات
+save = حفظ التغييرات
+saving = حفظ
+schedule.anc_lmp = تذكيرات الرعاية السابقة للولادة الدورة الشهرية الأخيرة\: مجموعة {{group}}
+schedule.anc_lmp_from_app = تذكيرات الرعاية السابقة للولادة الدورة الشهرية الأخيرة\: مجموعة {{group}}
+schedule.anc_no_lmp = تذكيرات الرعاية السابقة للولادة\: مجموعة {{group}}
+schedule.child_health = صحة الطفل\: مجموعة {{group}}
+schedule.delivery_lmp = تذكيرات الولادة\: مجموعة {{group}}
+schedule.delivery_lmp_from_app = تذكيرات الولادة\: مجموعة {{group}}
+schedule.delivery_no_lmp = تذكيرات الولادة\: مجموعة {{group}}
+schedule.imm = التطعيمات\: مجموعة {{group}}
+schedule.nutrition_evaluation = تقييم التغذية
+schedule.nutrition_otp = الجدول الزمني للبرنامج العلاجي للمرضى الخارجيين
+schedule.nutrition_sc = الجدول الزمني لمركز إعادة التأهيل
+schedule.nutrition_sc_exit = الجدول الزمني للخروج من مركز إعادة التأهيل
+schedule.nutrition_sfp = الجدول الزمني لبرنامج التغذية التكميلية
+schedule.pnc = رعاية ما بعد الولادة\: مجموعة {{group}}
+schedule.pnc_facility_birth = رعاية ما بعد الولادة للولادة في المرفق\: مجموعة {{group}}
+schedule.pnc_from_app = رعاية ما بعد الولادة من التطبيق\: مجموعة {{group}}
+schedule.registration_anc = متابعة التسجيل
+schedule.registration_anc_pnc = متابعة التسجيل
+scheduled = الطابع الزمني المُجدوَل
+scheduled_tasks = المهام المُجدوَلة
+search_bar.filter.label = الفلتر
+search_bar.sort.label = ترتيب
+select.mode.count.plural = عدد السجلات المحددة {{number}}
+select.mode.count.singular = سجل واحد تم تحديده
+select.mode.delete.all = حذف الكل
+select.mode.deselect.all = مسح الاختيار
+select.mode.select.all = اختيار الكل
+select.mode.start = اختيار
+select.mode.stop = إغلاق
+selection.doc.content.raw = محتوى التقرير الأولي
+send\ the\ following\ message\ to\ the = أرسل الرسالة التالية إلى
+sent = الطابع الزمني المُرسَل
+sent_timestamp = الطابع الزمني المُرسَل
+settings.backup.action = تنزيل الإعدادات الحالية
+settings.backup.description = قم بتنزيل نسخة من الإعدادات الحالية.
+settings.backup.title = رمز تطبيق النسخ الاحتياطي
+settings.backuprestore = رمز تطبيق النسخ الاحتياطي
+settings.backuprestore.description = يمكنك هنا تنزيل إعدادات التطبيق أو تحميلها بتنسيق JSON. يحتوي JSON هذا على معظم رمز التطبيق بخلاف النماذج والأيقونات والترجمات.
+settings.restore.action = تحميل رمز التطبيق
+settings.restore.description = استيراد ملف JSON جديد واستبدال الإعدادات الحالية.
+settings.restore.title = تحميل رمز التطبيق
+setup.language.outgoing.subtitle = اختر اللغة التي يرغب منسقو الرعاية لديك في تلقي الرسائل الآلية من CHT بها.
+setup.language.subtitle = اختر اللغة الافتراضية التي سيستعملها مستخدموCHT. يمكن للمستخدمين ضبط التفضيلات الفردية بعد تسجيل الدخول.
+sidebar_menu.title = القائمة
+sms_message.message = رسالة واردة
+sms_received = تم استلام رسالة SMS. ستتم مراجعتها قريباً. إذا كنت تحاول إرسال نموذج نصي، يرجى إدخال رمز النموذج الصحيح والمحاولة مرة أخرى.
+state.cleared = تم المسح
+state.delivered = تم التسليم
+state.denied = مرفوض
+state.duplicate = مكرر
+state.failed = فشل
+state.forwarded-by-gateway = أُعيد توجيهها عن طريق البوابة
+state.forwarded-to-gateway = أُعيد توجيهها إلى البوابة
+state.muted = تم الكتم
+state.pending = معلّق
+state.received = تم الاستلام
+state.received-by-gateway = تم استلامها بواسطة البوابة
+state.scheduled = تمت الجدولة
+state.sent = تم الإرسال
+status.review.correct = تمت المراجعة\: صحيح
+status.review.errors = تمت المراجعة\: الأخطاء
+status.review.title = مراجعة المدير
+status.review.unverified = لم تتم المراجعة
+status.sms.invalid = رسالة SMS غير صالحة
+status.sms.title = صلاحية رسائل SMS
+status.sms.valid = رسالة SMS صالحة
+submit.icon = أيقونة التحميل
+sync.last_success = آخر مزامنة
+sync.now = إجراء المزامنة الآن
+sync.retry = إعادة المحاولة
+sync.feedback.failure.unknown = تعذّر إجراء المزامنة. تعذر الاتصال.
+sync.status.in_progress = هل تجري المزامنة حالياً؟
+sync.status.not_required = تمت مزامنة جميع التقارير
+sync.status.required = تقارير للمزامنة
+sync.status.unknown = تعذر الاتصال
+sys.empty = تظهر الرسالة فارغة.
+sys.facility_not_found = المرفق غير موجود.
+sys.form_not_found = النموذج  '{{form}}' غير موجود.
+sys.incorrect_type = نوع الحقل غير صحيح {{key}}، المتوقع {{expectedType}}.
+sys.missing_fields = حقول مفقودة أو غير صالحة\: {{fields}}.
+sys.recipient_not_found = تعذر العثور على مستلم الرسالة.
+targets.all_time.subtitle = كل الوقت
+targets.births.title = الولادات
+targets.count.default = ({{pass}} من {{total}})
+targets.disabled = تم تعطيل المستهدفات لحساب المستخدم.
+targets.no_targets = لم يتم العثور على مستهدف.
+targets.this_month.subtitle = هذا الشهر
+targets.last_month.subtitle = الشهر الماضي
+task.date = تاريخ الاستحقاق
+task.days.left = {DAYS, plural, one{1 day left} other{\# days left}}
+task.list.complete = لا مزيد من المهام
+task.overdue = موعد الاستحقاق اليوم
+task.overdue.days = {DAYS, plural, =0{Due today} =1{Due yesterday} other{Due \# days ago}}
+task.priority = الأولوية
+task.state = حالة الرسالة
+task.type = نوع الرسالة
+tasks = الرسائل الصادرة
+tasks.0.messages.0.message = الرسالة
+tasks.0.messages.0.to = إلى
+tasks.0.state = حالة
+tasks.0.timestamp = الطابع الزمني
+tasks.disabled = تم تعطيل المهام لحساب المستخدم.
+tasks.none = لا توجد مهام.
+tasks.none.n.weeks = {WEEKS, plural, one{No tasks in the next week.} other{No tasks in the next \# weeks.}}
+tasks.group.leave = هل تريد بالتأكيد مغادرة هذه الصفحة؟ لن تتمكن بعد الآن من رؤية المهام الأخرى لهذه الأسرة.
+tasks.group.completed = اكتمال جميع مهام الأسرة
+tasks.group.title = مهام أخرى للأسرة
+testing.description = لقد وجدت صفحة الاختبارات السرية الخاصة بنا التي تحتوي على الكثير من الوظائف الخطيرة. إذا لم تكن مستعداً لكسر التثبيت، فارجع الآن\!
+testing.title = صفحة الاختبار
+title = العنوان
+to\ recipient = إلى {{recipient}}
+today = اليوم
+tomorrow = غداً
+training_cards.confirm.exit = لم يتم الانتهاء من هذا التدريب. إذا غادرت الآن، ستفقد تقدمك وسيطلب منك إكماله في وقت لاحق.
+training_cards.confirm.button.no = إلغاء
+training_cards.confirm.button.yes = مغادرة
+training_cards.confirm.title = هل تريد ترك التدريب؟
+training_cards.error.loading = خطأ في تحميل التدريب. يُرجى التواصل مع المشرف.
+training_cards.error.save = خطأ في حفظ التدريب.
+training_cards.form.saved = تم الانتهاء من التدريب.
+training_materials.page.no_more_trainings = لا مزيد من التدريبات
+training_materials.page.no_selected = لم يتم تحديد أي مواد تدريبية
+training_materials.page.no_trainings = لم يتم العثور على أي تدريبات
+training_materials.page.title = المواد التدريبية
+translation.add = إضافة مفتاح ترجمة جديد
+translation.key = مفتاح الترجمة
+unique.id = معرّف فريد
+unknown.contact = جهة اتصال غير معروفة
+upgrade = الترقية
+upgrade.description = لترقية تطبيقك إلى إصدار أو نسخة تجريبية أو فرع محدد، يوصى بإجراء الإعداد أولاً. وهذا يسمح بإنجاز العمل في الخلفية للتحضير لعملية التثبيت بدون مقاطعة المستخدمين. بمجرد اكتمال عملية الإعداد، انقر على "تثبيت" لمواصلة الترقية. لا يمكن التراجع عن هذا الإجراء، لذا يُرجى التأكد من عمل نسخة احتياطية لبياناتك وإخطار المستخدمين بفترة التوقف.
+upload = التحميل
+upload.favicon = رمز المفضلة
+upload.header.logo = شعار الرأس
+upload.icon = أيقونة التحميل
+upload.json.forms.help = يجب أن يحتوي الملف على قائمة مشفرة بصيغة JSON لتعريفات النماذج. لا يجوز تحميل أكثر من ملف نموذج تطبيق واحد في كل مرة، وسيتم استبدال أي نماذج موجودة.
+upload.json.forms.title = تحميل نماذج JSON
+upload.sms.forms = تحميل نماذج رسائل SMS
+upload.xform.context = التعريف
+upload.xform.help = يجب أن تحتوي الملفات على نموذج XForm وسياق JSON المرتبط به. إذا كان هناك نموذج موجود، فسيتم استبداله.
+upload.xform.meta.help = ملف بيانات التعريف بتنسيق JSON بما في ذلك الرمز والعنوان والسياق وما إلى ذلك.
+upload.xform.title = تحميل نموذج XML
+upload.xform.xml = XML
+upload.xform.xml.help = تعريف xform في XML.
+url = عنوان URL
+user.fullname.help = الاسم الكامل للمستخدم
+user.password.current = كلمة المرور الحالية
+user.phone.help = يجب أن يكون رقم الهاتف صالحاً بدون شرطات أو علامات ترقيم.
+user.place.help = يجب ربط جميع المستخدمين بمكان في النظام ليتم تحديد موقعهم بشكل صحيح في التسلسل الهرمي ورؤية البيانات المناسبة عند تسجيل الدخول.
+user.username.help = هذا هو ما ستستخدمه لتسجيل الدخول إلى التطبيق.
+username.invalid = اسم المستخدم غير صالح. الأحرف الصالحة هي الأحرف الصغيرة، والأرقام، والشرطة السفلية (_)، والواصلات (-).
+username.taken = اسم المستخدم "{{username}}" محجوز بالفعل.
+users.import.accepted_types = يتم قبول ملف بتنسيق csv. فقط.
+users.import.cancel_upload = إلغاء
+users.import.confirm_upload = نعم، قم بالتحميل
+users.import.confirm_upload_text = هل تريد بالتأكيد تحميل
+users.import.instructions = لإضافة عدة مستخدمين، يرجى تحميل جدول البيانات المناسب.
+users.import.processing.title = معالجة المستخدمين
+users.import.processing.instructions = قد تستغرق هذه العملية وقتاً طويلاً، إذا كنت تقوم بتحميل عدد كبير من المستخدمين، فيرجى التحلي بالصبر.
+users.import.summary.added_users = تمت إضافة المستخدمين
+users.import.summary.click = انقر
+users.import.summary.download_status_file = لتحميل ملف الحالة الخاص بك.
+users.import.summary.failed_users = تحتوي على أخطاء
+users.import.summary.here = هنا
+users.import.summary.previously_added_users = المستوردة سابقاً
+users.import.summary.resubmit.instructions = لإعادة إرسال بيانات المستخدمين التي تحتوي على أخطاء:
+users.import.summary.resubmit.step1 = 1. افتح ملف الحالة الذي تم تنزيله
+users.import.summary.resubmit.step2 = 2. قارن الأخطاء مع جدول البيانات المنسق
+users.import.summary.resubmit.step3 = 3. صحح الصفوف التي بها أخطاء وصدّرها إلى ملف بتنسيق csv.
+users.import.summary.resubmit.step4 = 4. أعِد تحميل جدول البيانات المحدّث
+users.import.title = الاستيراد من ملف
+users.import.unavailable.instructions = يقوم شخص آخر في النظام حالياً بعملية إضافة عدة مستخدمين.
+users.import.unavailable.retry = يرجى المحاولة مرة أخرى في وقت لاحق
+users.import.unavailable.title = غير متوفر حالياً
+users.import.upload_button = تحميل ملف csv.
+users.manage.add_single_user = إضافة مستخدم
+users.manage.back = العودة إلى قائمة المستخدمين
+users.manage.import_users = الاستيراد من ملف
+usertype._admin = المسؤول
+usertype.admin = المسؤول
+usertype.analytics = التحليلات - تصدير البيانات عبر عنوان URL فقط
+usertype.computers = أجهزة الكمبيوتر
+usertype.data-entry = إدخال البيانات - الوصول إلى Medic Reporter فقط
+usertype.district-manager = المدير الإقليمي - وصول مقيّد
+usertype.gateway = بوابة - مستخدم ذو وصول محدود لبوابة Medic
+usertype.national-manager = المدير الوطني - الوصول إلى جميع المستندات
+usertype.people = الأشخاص
+usertype.unknown = غير معروف
+validate.required = هذا الحقل مطلوب.
+version = الإصدار
+version.update.description = تم تحديث تطبيقك ويجب إعادة تحميله. إذا قمت بالإلغاء الآن، سيتم تذكيرك مرة أخرى بعد ساعتين.
+version.update.title = التحديث متاح
+view.all = عرض الكل
+week = أسبوع
+week.plural = أسابيع
+weeks = أسابيع
+wipe.device.description = تحذير\! سيؤدي ذلك إلى حذف جميع البيانات من جهازك وتسجيل خروجك. ستفقد أي بيانات غير متزامنة\!
+wipe.device.title = مسح الجهاز
+with = مع
+with.lmp = مع الدورة الشهرية الأخيرة
+without.lmp = بدون الدورة الشهرية الأخيرة
+year = سنة
+year.plural = سنوات
+years = سنوات
+yes = نعم
+yesterday = أمس
diff --git a/api/resources/translations/messages-en.properties b/api/resources/translations/messages-en.properties
index cb04a0a6e72..3bc93546cdc 100644
--- a/api/resources/translations/messages-en.properties
+++ b/api/resources/translations/messages-en.properties
@@ -437,7 +437,7 @@ configuration.sms = SMS
 configuration.sms.forms = SMS forms
 configuration.sms.forms.title = You need to choose both an XML file and a Meta file before clicking the upload button. You may only upload one app form file at a time and any existing forms will be overwritten.
 configuration.sms.settings = Basic settings
-configuration.sms.test.description = Use this page to send a test message to the production application without going through the SMS Gateway. Be sure to use a phone number registered to a CHW’s profile to mimic a report coming from him or her about a particular patient.
+configuration.sms.test.description = Use this page to send a test message to the production application without going through the SMS Gateway. Be sure to use a phone number registered to a CHW?s profile to mimic a report coming from him or her about a particular patient.
 configuration.sms.test.from.number = From phone number
 configuration.sms.test.message.description = Limit of 144 characters
 configuration.sms.test.number.validation.description = Please enter a valid phone number without dashes or punctuation.
@@ -454,7 +454,7 @@ confirm.destructive.navigation.submit = Exit
 confirm.destructive.navigation.title = Exit form?
 confirm.logout = You will need an internet connection to log back in.
 password.updated = Your password has been successfully updated.
-confirm.verification = This report will be verified as “correct”. This cannot be changed later.
+confirm.verification = This report will be verified as ?correct?. This cannot be changed later.
 confirm.verification.submit = Verify as correct
 confirm.verification.title = Verify report
 contact.age = Age
@@ -654,8 +654,8 @@ enketo.geopicker.altitude = altitude (m)
 enketo.geopicker.closepolygon = close polygon
 enketo.geopicker.kmlcoords = KML coordinates
 enketo.geopicker.kmlpaste = paste KML coordinates here
-enketo.geopicker.latitude = latitude (x.y °)
-enketo.geopicker.longitude = longitude (x.y °)
+enketo.geopicker.latitude = latitude (x.y �)
+enketo.geopicker.longitude = longitude (x.y �)
 enketo.geopicker.points = points
 enketo.geopicker.searchPlaceholder = search for place or address
 enketo.geopicker.removePoint = This will completely remove the current geopoint from the list of geopoints and cannot be undone. Are you sure you want to do this?
@@ -686,7 +686,7 @@ export.dhis.place.all = All Places
 export.dhis.place.description = Filter exported data to include data associated with contacts under this place in the hierarchy.
 export.dhis.place.label = Filter by place
 export.dhis.unconfigured = DHIS2 integration is not configured.
-export.feedback.description = Download a log of detected errors and user feedback submitted via the “Report bug” feature in CSV format. The table below shows the most recently submitted reports.
+export.feedback.description = Download a log of detected errors and user feedback submitted via the ?Report bug? feature in CSV format. The table below shows the most recently submitted reports.
 export.messages.description = Download all messages that have ever been sent or received in CSV format.
 export.people.description = Download all contacts registered in the system in JSON format.
 export.reports.description = Download a summary of all the reports that have ever been submitted in CSV format.
@@ -1215,7 +1215,7 @@ sync.last_success = Last sync
 sync.now = Sync now
 sync.retry = Retry
 sync.feedback.failure.unknown = Sync failed. Unable to connect.
-sync.status.in_progress = Currently syncing…
+sync.status.in_progress = Currently syncing?
 sync.status.not_required = All reports synced
 sync.status.required = Reports to sync
 sync.status.unknown = Unable to connect
@@ -1264,7 +1264,10 @@ training_cards.confirm.title = Leave training?
 training_cards.error.loading = Error loading training. Please contact your supervisor.
 training_cards.error.save = Error saving training.
 training_cards.form.saved = Training completed.
-training_cards.modal.title = Important changes
+training_materials.page.no_more_trainings = No more trainings
+training_materials.page.no_selected = No training material selected
+training_materials.page.no_trainings = No trainings found
+training_materials.page.title = Training materials
 translation.add = Add new translation key
 translation.key = Translation key
 unique.id = Unique ID
diff --git a/api/resources/translations/messages-es.properties b/api/resources/translations/messages-es.properties
index 2bb18b9bcf7..4dcc0aa8506 100644
--- a/api/resources/translations/messages-es.properties
+++ b/api/resources/translations/messages-es.properties
@@ -1264,7 +1264,10 @@ training_cards.confirm.title = \¿Salir del entrenamiento\?
 training_cards.error.loading = Hubo un error al cargar el entrenamiento. Por favor contacte a su supervisor.
 training_cards.error.save = Hubo un error al guardar el entrenamiento.
 training_cards.form.saved = Entrenamiento completado.
-training_cards.modal.title = Cambios importantes
+training_materials.page.no_more_trainings = No hay más entrenamientos
+training_materials.page.no_selected = Ningún material de entrenamiento seleccionado
+training_materials.page.no_trainings = No se encontraron entrenamientos
+training_materials.page.title = Materiales de entrenamiento
 translation.add = Agregar Traducción
 translation.key = Clave de traducción
 unique.id = Identificación única
diff --git a/api/resources/translations/messages-fr.properties b/api/resources/translations/messages-fr.properties
index a82b00af6de..0b9923ec74a 100644
--- a/api/resources/translations/messages-fr.properties
+++ b/api/resources/translations/messages-fr.properties
@@ -854,7 +854,7 @@ messages.n.report_accepted = Merci {{contact.name}} d'avoir enregistré {{patien
 messages.n.validation.patient_name = {{\#patient_name}} Le format est incorrect, assurez-vous que le message commence avec N suivi d'un espace et du nom de la personne (maximum 30 charactères).{{/patient_name}}{{^patient_name}} Le format est incorrect, assurez-vous que le message commence avec N suivi du nom de la personne.{{/patient_name}}
 messages.off.report_accepted = Aucune autre notification concernant {{patient_name}} ne sera envoyée tant que vous n'aurez pas envoyé 'ON {{patient_id}}'. {{\#chw_sms}} {{chw_sms}} {{/chw_sms}}
 messages.on.report_accepted = Les notifications pour {{patient_name}} ({{patient_id}}) ont été réactivées. {{\#chw_sms}} {{chw_sms}} {{/chw_sms}}
-messages.p.report_accepted = Merci pour avoir enregistré la grossesse 
+messages.p.report_accepted = Merci pour avoir enregistré la grossesse de {{patient_name}} ({{patient_id}}).{{\#expected_date}} La date prévue pour l'accouchement est {{\#date}}{{expected_date}}{{/date}}{{/expected_date}}
 messages.p.validation.last_menstrual_period = Le format d'enregistrement pour {{patient_name}} est incorrect, merci de vous assurer que la dernière menstruation soit un nombre entre 2 et 42. 
 messages.relay.chw_sms = {{\#chw_sms}}{{chw_sms}}{{/chw_sms}}
 messages.schedule.anc.checkin = Où est-ce que {{patient_name}} a acouché? Répondez par 'D {{patient_id}} F' pour un accouchement dans un centre de santé, 'D {{patient_id}} S' pour un accouchement à domicile avec une accoucheuse qualifiée, 'D {{patient_id}} NS pour un accouchement à domicile non qualifié.
@@ -934,8 +934,8 @@ messages.schedule.postnatal.day_7 = Merci de vérifier si le {{patient_name}} ({
 messages.schedule.postnatal.day_7_overdue = Est-ce que le patient {{patient_name}} ({{patient_id}}) est allé à la CPON du 7ème jour ? Confirmez avec 'M {{patient_id}}'. Merci \!
 messages.schedule.postnatal.week_6 = Merci de vérifier si le {{patient_name}} ({{patient_id}}) est partie cette semaine pour sa visite postnatale de la semaine - 6. Quand c'est fait, merci de nous le notifier avec 'M {{patient_id}}'. Merci \!
 messages.schedule.postnatal.week_6_overdue = Est-ce que {{patient_name}} ({{patient_id}}) est allée pour sa visite de 6eme semaine? Merci de confirmer en envoyant 'M {{patient_id}}'. Merci\!
-messages.schedule.registration.followup_anc = Salut {{contact.name}}, n'oubliez de soumettre l'enregistrement de la grossesse pour  {{patient_name}} {{patient_id}} avec 'P {{patient_id}} <Weeks since LMP>'. Merci\!
-messages.schedule.registration.followup_anc_pnc = {{contact.name}}, est-ce que {{patient_name}} {{patient_id}} a besoin de soins? Pour enregistrer une grossesse envoyer  'P {{patient_id}} <Weeks since LMP>'. Pour les Soins postnataux, soumettre un rapport d'accouchement en envoyant  'D {{patient_id}} <Delivery Code> <Days Since Delivery>'. Merci\!
+messages.schedule.registration.followup_anc = Salut {{contact.name}}, n'oubliez de soumettre l'enregistrement de la grossesse pour  {{patient_name}} {{patient_id}} avec 'P {{patient_id}} <Semaines depuis les dernières règles>'. Merci\!
+messages.schedule.registration.followup_anc_pnc = {{contact.name}}, est-ce que {{patient_name}} {{patient_id}} a besoin de soins? Pour enregistrer une grossesse envoyer  'P {{patient_id}} <Semaines depuis les dernières règles>'. Pour les Soins postnataux, soumettre un rapport d'accouchement en envoyant  'D {{patient_id}} <Code Accouchement> <Jours depuis Accouchement>'. Merci\!
 messages.sent.by = Soumis par {{senderName}}
 messages.unknown.sender = Émetteur inconnu
 messages.v.report_accepted = Merci beaucoup {{contact.name}}, la visite de {{patient_name}} ({{patient_id}}) a été enregistrée.
@@ -1264,7 +1264,10 @@ training_cards.confirm.title = Quitter l'entraînement?
 training_cards.error.loading = Erreur lors du chargement de la formation. Veuillez contacter votre superviseur.
 training_cards.error.save = Erreur lors de l'enregistrement de la formation.
 training_cards.form.saved = Formation terminée.
-training_cards.modal.title = Changements importants
+training_materials.page.no_more_trainings = Aucune formation restante
+training_materials.page.no_selected = Aucun matériel de formation sélectionné
+training_materials.page.no_trainings = Aucune formation trouvée
+training_materials.page.title = Matériel de formation
 translation.add = Ajouter une traduction
 translation.key = Clé de traduction
 unique.id = ID unique
diff --git a/api/resources/translations/messages-hi.properties b/api/resources/translations/messages-hi.properties
index 9b012194aff..e39d2bf0510 100644
--- a/api/resources/translations/messages-hi.properties
+++ b/api/resources/translations/messages-hi.properties
@@ -1168,6 +1168,10 @@ training_cards.confirm.exit = यह प्रशिक्षण समाप्
 training_cards.confirm.button.no = रद्द करें
 training_cards.confirm.button.yes = बाहर निकलें
 training_cards.confirm.title = प्रशिक्षण छोड़ें?
+training_materials.page.no_more_trainings = अब और कोई प्रशिक्षण नहीं है
+training_materials.page.no_selected = कोई प्रशिक्षण दस्तावेज़ नहीं चुना गया
+training_materials.page.no_trainings = कोई प्रशिक्षण नहीं मिला
+training_materials.page.title = प्रशिक्षण दस्तावेज़
 translation.add = अनुवाद दर्ज करें
 translation.key = अनुवाद का गाइड
 unique.id = 
diff --git a/api/resources/translations/messages-id.properties b/api/resources/translations/messages-id.properties
index 53a0b392f54..2e5074230a7 100644
--- a/api/resources/translations/messages-id.properties
+++ b/api/resources/translations/messages-id.properties
@@ -49,7 +49,7 @@ Contacts = Orang
 Contacts\ file\ help = Pilih file .json untuk kontak
 Content = Isi
 Continue = Lanjut
-Current\ Password = 
+Current\ Password = Kata sandi saat ini
 Dashboard\ settings\ page = Halaman pengaturan dashboard
 Date\ display\ format = Format tampilan tanggal
 Datetime\ display\ format = Format tampilan tanggalwaktu
@@ -61,7 +61,7 @@ Delete = Hapus
 Deleting = Menghapus
 Disable = Dimatikan
 Discard\ changes\ to\ current\ language = Anda ingin melanjutkan dan membuang perubahan yang dibuat bagi bahasa yang saat ini digunakan?
-Display = 
+Display = Tampilan
 District = Kabupaten
 District\ Contact\ Name = Nama Kontak
 District\ Contact\ Phone = Nomor telepon
@@ -162,7 +162,7 @@ No\ registrations\ found = Tidak ada registrasi yang ditemukan untuk jadwal ini.
 No\ report\ selected = Tidak ada laporan yang dipilih
 No\ reports\ found = Tidak ada laporan ditemukan
 No\ schedules\ found = Tidak ada jadwal yang ditemukan
-No\ submission = 
+No\ submission = Jangan bagikan data dampak.
 No\ task\ selected = Tidak ada tugas yang dipilih
 No\ tasks\ found = Tidak ada tugas yang ditemukan
 Notes = Catatan
@@ -280,18 +280,18 @@ action.district_hospital.add = Kabupaten Baru
 action.health_center.add = Puskesmas Baru
 action.person.add = Orang Baru
 action.report.add = Aksi Baru
-admin.app.name = 
-admin.display = 
-admin.display.datetime = 
+admin.app.name = Manajemen Aplikasi
+admin.display = Tampilan
+admin.display.datetime = Tanggal & waktu
 admin.message.queue = Pesan Keluar
-admin.message.queue.created = 
-admin.message.queue.due = 
+admin.message.queue.created = Dibuat
+admin.message.queue.due = Jatuh tempo
 admin.message.queue.error = Error ketika mengambil pesan
 admin.message.queue.message = Pesan
 admin.message.queue.recipient = Penerima 
 admin.message.queue.scheduled = Terjadwal
 admin.message.queue.status = Status
-admin.message.queue.tab.due = 
+admin.message.queue.tab.due = Jatuh tempo
 admin.message.queue.tab.muted.future = Tidak akan dikirim
 admin.message.queue.tab.muted.past = Tidak terkirim
 admin.message.queue.tab.scheduled = Terjadwal
@@ -302,7 +302,7 @@ admin.pagination.first = Pertama
 admin.pagination.last = Terakhir
 admin.pagination.next = Lanjut
 admin.pagination.prev = Sebelumnya
-admin.targets.description = 
+admin.targets.description = Tujuan dengan nilai -1 akan menunjukkan target tanpa tujuan.
 after\ the = setelah
 analytics.anc.active-pregnancies = Kehamilan Aktif
 analytics.anc.delivery-locations = Lokasi persalinan yang dilaporkan
@@ -331,28 +331,28 @@ analytics.reporting.not_submitted = Laporan hilang
 analytics.reporting.reporting_rate = Kecepatan Pelaporan
 analytics.reporting.reports = Laporan
 analytics.target.add = Tambah target
-analytics.target.aggregates = 
-analytics.target.aggregates.disabled = 
-analytics.target.aggregates.error = 
-analytics.target.aggregates.error.no.contact = 
-analytics.target.aggregates.error.not.found = 
-analytics.target.aggregates.no.data = 
-analytics.target.aggregates.no.target.selected = 
-analytics.target.aggregates.no.targets = 
-analytics.target.aggregates.ratio = 
-analytics.target.aggregates.reported = 
-analytics.target.aggregates.select.error = 
-analytics.target.aggregates.supervisees.meeting.goal = 
-analytics.target.aggregates.total = 
+analytics.target.aggregates = Agregat target
+analytics.target.aggregates.disabled = Agregat target dinonaktifkan
+analytics.target.aggregates.error = Terjadi kesalahan saat mengambil agregat target
+analytics.target.aggregates.error.no.contact = Terjadi kesalahan saat memuat agregat target. Pengguna Anda tidak memiliki tempat tinggal utama atau tidak memiliki akses ke tempat tinggal terkait. Hubungi administrator Anda untuk memperbaiki masalah ini.
+analytics.target.aggregates.error.not.found = Terjadi kesalahan saat memuat agregat target\: Target tidak ditemukan.
+analytics.target.aggregates.no.data = Tidak ada data
+analytics.target.aggregates.no.target.selected = Tidak ada target yang dipilih.
+analytics.target.aggregates.no.targets = Tidak ada agregat target yang ditemukan
+analytics.target.aggregates.ratio = {{pass}} dari {{total}}
+analytics.target.aggregates.reported = Dilaporkan
+analytics.target.aggregates.select.error = Terjadi kesalahan saat memuat agregat target.
+analytics.target.aggregates.supervisees.meeting.goal = CHW yang mencapai tujuan
+analytics.target.aggregates.total = Total
 analytics.target.aggregates.reporting_period = Periode pelaporan
 analytics.target.goal = Tujuan
-analytics.target.goal.help = 
+analytics.target.goal.help = Jika Anda tidak ingin menampilkan target, masukkan nilai '-1'.
 analytics.target.icon = Icon
 analytics.target.icon.help = ID Icon yang terkonfigurasi
 analytics.target.id = ID Unik
 analytics.target.monthly_goal = Tujuan Perbulan
 analytics.target.name = Nama
-analytics.target.name.help = 
+analytics.target.name.help = Jika Anda menambahkan terjemahan untuk nama target di sini, Anda tetap harus menambahkannya di halaman bahasa.
 analytics.target.type = Tipe
 analytics.target.type.count = Hitung
 analytics.target.type.percent = Persen
@@ -369,17 +369,19 @@ android_app.data_usage.system.title = Sistim-luas
 android_app.data_usage.title = Penggunaan Data App
 android_app.data_usage.tx = Dikirimkan
 android_app.version.title = Versi Android App
-app.name = 
-app.version.unknown = 
+app.name = Aplikasi
+app.version.unknown = Tidak Diketahui - koneksi internet diperlukan.
 associated.contact = Kontak yang berhubungan
 associated.contact.help = Ketika pengguna ini membuat laporan, mereka akan dihubungkan kepada kontak ini
 autoreply = jawab otomatis
 birth_date = Tanggal Lahir
-branding = 
-branding.favicon.field = 
-branding.logo.field = 
-branding.title.field = 
+branding = Branding
+branding.favicon.field = Ikon kecil
+branding.logo.field = Logo
+branding.title.field = Judul
 branding.title.field.help =
+branding.icon.field = Ikon besar
+branding.icon.field.help = Akan ditampilkan untuk instalasi PWA. Harus berukuran setidaknya 144 piksel persegi.
 browser.compatibility.title = Hubungi Supervisor Anda
 browser.compatibility.description = Silakan hubungi supervisor Anda untuk memperbarui browser Anda.
 browser.compatibility.confirm = Oke
@@ -387,7 +389,7 @@ bulkdelete.confirm.action = Hapus
 bulkdelete.confirm.title = Hapus pencatatan?
 bulkdelete.confirm.title.plural = Hapus pencatatan yang dipilih?
 call = Telepon
-case_id = 
+case_id = ID Kasus
 child_birth_date = Tanggal Lahir Anak
 child_birth_outcome = Outcome Anak dilahirkan
 child_birth_weight = Berat Lahir Anak
@@ -948,9 +950,9 @@ person.field.title = Judul
 phone\ number\ not\ unique = Nomor ini sudah teregistrasi untuk kontak {{name}}
 place.deleted = [dihapus]
 place.unavailable = [tidak tersedia]
-privacy.policy = 
-privacy.policy.accept = 
-privacy.policy.not.found = 
+privacy.policy = Kebijakan Privasi
+privacy.policy.accept = Setujui
+privacy.policy.not.found = Kebijakan Privasi tidak ditemukan
 purge.description = 
 purge.title = 
 quarter = Kuartal
@@ -1106,15 +1108,12 @@ setup.start = Selesai
 setup.statistics.description = 
 setup.statistics.title =
 sidebar_menu.title = Menu
-simprints.disabled = 
-simprints.register = Daftar dengan Simprints
-simprints.search = Cari dengan Simprints
 sms_message.message = Pesan Masuk
 sms_received = Pesan SMS telah diterima; akan segera dibaca. Bila anda ingin mengirim formulir teks, masukkan kode formulir yang benar dan kirim kembali.
 state.cleared = dibersihkan
 state.delivered = terkirim
 state.denied = ditolak
-state.duplicate = 
+state.duplicate = duplikat
 state.failed = gagal
 state.forwarded-by-gateway = diteruskan oleh gateway
 state.forwarded-to-gateway = diteruskan ke gateway
@@ -1124,16 +1123,16 @@ state.received = diterima
 state.received-by-gateway = diterima oleh gateway
 state.scheduled = terjadwal
 state.sent = terkirim
-status.review.correct = 
-status.review.errors = 
-status.review.title = 
-status.review.unverified = 
+status.review.correct = Ditinjau\: benar
+status.review.errors = Ditinjau\: terdapat kesalahan
+status.review.title = Tinjauan manajer
+status.review.unverified = Belum ditinjau
 status.sms.invalid = Invalid SMS
 status.sms.title = SMS validitas
 status.sms.valid = Valid SMS
-submit.icon = 
+submit.icon = Unggah ikon
 sync.last_success = Sinkronisasi terakhir
-sync.now = 
+sync.now = Sinkronkan sekarang
 sync.status.in_progress = Saat ini melakukan sinkronisasi
 sync.status.not_required = Semua laporan disinkronkan
 sync.status.required = Laporan yang perlu disinkronkan
@@ -1141,12 +1140,12 @@ sync.status.unknown = Tidak diketahui
 sys.empty = Pesan terlihat kosong.
 sys.facility_not_found = Fasilitas tidak ditemukan.
 sys.form_not_found = Formulir '{{form}}' tidak ditemukan.
-sys.incorrect_type = 
+sys.incorrect_type = Jenis bidang tidak sesuai {{key}}, diharapkan {{expectedType}}.
 sys.missing_fields = Tidak ditemukan atau salah\: {{fields}}.
 sys.recipient_not_found = Penerima pesan tidak ditemukan
 targets.all_time.subtitle = Total
 targets.births.title = Kelahiran
-targets.count.default = {{pass}} dari {{total}} 
+targets.count.default = {{pass}} dari {{total}}
 targets.disabled = Target dinonaktifkan untuk pengguna admin. Jika Anda perlu melihat sasaran, login sebagai user biasa.
 targets.this_month.subtitle = Bulan ini
 targets.last_month.subtitle = Bulan sebelumnya
@@ -1163,26 +1162,30 @@ tasks.0.messages.0.to = Kepada
 tasks.0.state = Status
 tasks.0.timestamp = Waktu
 tasks.disabled = Tugas dimatikan bagi pengguna admin. Bila ingin melihat tugas, login sebagai pengguna normal
-tasks.none = Tidak ada tugas.\n
-tasks.none.n.weeks = {WEEKS, plural, \=1{Tidak ada tugas di minggu depan.} other{Tidak ada tugas di \# minggu ke depan.}} 
+tasks.none = Tidak ada tugas.
+tasks.none.n.weeks = {WEEKS, plural, one{Tidak ada tugas di minggu depan.} other{Tidak ada tugas di \# minggu ke depan.}}
 testing.description = 
-testing.title = 
+testing.title =
 title = 
-to\ recipient = Kepada {{recipient}} 
+to\ recipient = Kepada {{recipient}}
 today = hari ini
 tomorrow = besok
 training_cards.confirm.exit = Pelatihan ini belum selesai. Jika Anda keluar sekarang, Anda akan kehilangan kemajuan Anda dan akan diminta lagi nanti untuk menyelesaikannya.
 training_cards.confirm.button.no = Batalkan
 training_cards.confirm.button.yes = Keluar
 training_cards.confirm.title = Keluar dari pelatihan?
+training_materials.page.no_more_trainings = Tidak ada lagi pelatihan
+training_materials.page.no_selected = Tidak ada materi pelatihan yang dipilih
+training_materials.page.no_trainings = Tidak ditemukan pelatihan
+training_materials.page.title = Materi pelatihan
 translation.add = Tambah terjemahan
 translation.key = Kunci terjemahan
-unique.id = 
-upgrade = 
-upgrade.description = 
-upload = 
-upload.favicon = 
-upload.header.logo = 
+unique.id = ID Unik
+upgrade = Tingkatkan
+upgrade.description = Untuk meningkatkan aplikasi Anda ke rilis, beta, atau cabang tertentu, disarankan untuk melakukan staging terlebih dahulu. Ini memungkinkan pekerjaan latar belakang diselesaikan untuk mempersiapkan instalasi tanpa mengganggu pengguna. Setelah proses staging selesai, klik Instal untuk melanjutkan peningkatan. Tindakan ini tidak dapat dibatalkan, jadi pastikan data Anda telah dicadangkan dan pengguna Anda telah diberi tahu tentang waktu henti.
+upload = Unggah
+upload.favicon = Favicon
+upload.header.logo = Logo Header
 upload.icon = Unggah Icon
 upload.json.forms.help = File harus berisi daftar kode JSON tentang definisi formulir. Semua formulir yang sudah ada akan digantikan.
 upload.json.forms.title = Unggah formulir JSON
@@ -1224,8 +1227,8 @@ welcome.setup.description = Gunakan petunjuk kami untuk pengaturan penting pada
 welcome.setup.title = Ijinkan kami mengatur sistim anda
 welcome.tour.description = Gunakan tur produk untuk mengenal platform Medic. Tur akan otomatis mulai setelah konfigurasi selesai. Anda dapat menemukannya pada menu drop-down.
 welcome.tour.title = Ijinkan kami untuk menjelaskan
-wipe.device.description = 
-wipe.device.title = 
+wipe.device.description = PERINGATAN! Ini akan menghapus semua data dari perangkat Anda dan mengeluarkan Anda. Data yang belum tersinkronisasi akan hilang!
+wipe.device.title = Hapus Data Perangkat
 with = Dengan
 with.lmp = Dengan Periode Menstruasi Terakhir 
 without.lmp = Tanpa Periode Menstruasi Terakhir 
diff --git a/api/resources/translations/messages-ne.properties b/api/resources/translations/messages-ne.properties
index ab858cbc35b..78fa02deecf 100644
--- a/api/resources/translations/messages-ne.properties
+++ b/api/resources/translations/messages-ne.properties
@@ -1264,7 +1264,10 @@ training_cards.confirm.title = तालिम छोड्ने हो?
 training_cards.error.loading = तालिम लोड गर्दा त्रुटि भयो। तपाइँको सुपरभाइजरलाई सम्पर्क गर्नुहोस्।
 training_cards.error.save = तालिम सेभ गर्न त्रुटि।
 training_cards.form.saved = तालिम सम्पन्न भयो।
-training_cards.modal.title = महत्वपुर्ण परिवर्तनहरु
+training_materials.page.no_more_trainings = थप तालिम छैन
+training_materials.page.no_selected = कुनै तालिम सामग्री छनोट गरिएको छैन।
+training_materials.page.no_trainings = तालिम फेला परेन
+training_materials.page.title = तालिम शीर्षक
 translation.add = नयाँ अनुवाद कुञ्जी थप्नुहोस्
 translation.key = अनुवाद कुञ्जी
 unique.id = आईडी
diff --git a/api/resources/translations/messages-sw.properties b/api/resources/translations/messages-sw.properties
index b7e0f9dae7e..13c4eadb09e 100644
--- a/api/resources/translations/messages-sw.properties
+++ b/api/resources/translations/messages-sw.properties
@@ -1264,7 +1264,10 @@ training_cards.confirm.title = Ungependa kuondoka kwenye mafunzo?
 training_cards.error.loading = Hitilafu katika kupakia mafunzo. Tafadhali wasiliana na msimamizi wako.
 training_cards.error.save = Hitilafu katika kuhifadhi mafunzo.
 training_cards.form.saved = Mafunzo yamekamilika.
-training_cards.modal.title = Mabadiliko muhimu
+training_materials.page.no_more_trainings = Hakuna mafunzo mengine
+training_materials.page.no_selected = Hakuna nyenzo za mafunzo zilizochaguliwa
+training_materials.page.no_trainings = Hakuna mafunzo yaliyopatikana
+training_materials.page.title = Vifaa vya mafunzo
 translation.add = Ongeza tafsiri
 translation.key = Ufunguo wa tafsiri
 unique.id = Kitambulisho cha kipekee
diff --git a/api/server.js b/api/server.js
index fb8d799d8ef..6364630fda2 100644
--- a/api/server.js
+++ b/api/server.js
@@ -82,7 +82,6 @@ process
     await migrations.run();
     logger.info('Database migrations completed successfully');
 
-    startupLog.start('forms');
     logger.info('Generating manifest');
     await manifest.generate();
     logger.info('Manifest generated successfully');
@@ -90,15 +89,20 @@ process
     logger.info('Generating service worker');
     await generateServiceWorker.run(true);
     logger.info('Service worker generated successfully');
+  } catch (err) {
+    logger.error('Fatal error initialising API');
+    logger.error('%o', err);
+    process.exit(1);
+  }
 
+  try {
+    startupLog.start('forms');
     logger.info('Updating xforms…');
     await generateXform.updateAll();
     logger.info('xforms updated successfully');
-
   } catch (err) {
-    logger.error('Fatal error initialising API');
+    logger.error('Error initialising API');
     logger.error('%o', err);
-    process.exit(1);
   }
 
   startupLog.complete();
diff --git a/api/src/errors.js b/api/src/errors.js
new file mode 100644
index 00000000000..70a3de8f368
--- /dev/null
+++ b/api/src/errors.js
@@ -0,0 +1,19 @@
+class PublicError extends Error {
+  constructor(publicMessage, ...args) {
+    super(publicMessage, ...args);
+    this.publicMessage = publicMessage;
+  }
+}
+
+class NotFoundError extends Error {
+  constructor(message, ...args) {
+    super(message, ...args);
+    this.status = 404; // simulate PouchDb error
+    this.statusCode = 404; // simulate Request error
+  }
+}
+
+module.exports = {
+  PublicError,
+  NotFoundError,
+};
diff --git a/api/src/public-error.js b/api/src/public-error.js
deleted file mode 100644
index 3d207200c7b..00000000000
--- a/api/src/public-error.js
+++ /dev/null
@@ -1,8 +0,0 @@
-class PublicError extends Error {
-  constructor(publicMessage, ...args) {
-    super(publicMessage, ...args);
-    this.publicMessage = publicMessage;
-  }
-}
-
-module.exports = PublicError;
diff --git a/api/src/services/privacy-policy.js b/api/src/services/privacy-policy.js
index ec1d6dd5e3c..4555195757d 100644
--- a/api/src/services/privacy-policy.js
+++ b/api/src/services/privacy-policy.js
@@ -2,6 +2,7 @@ const sanitizeHtml = require('sanitize-html');
 const db = require('../db');
 const logger = require('@medic/logger');
 const config = require('../config');
+const { NotFoundError } = require('../errors');
 
 const PRIVACY_POLICY_DOC_ID = 'privacy-policies';
 
@@ -22,7 +23,7 @@ const getDoc = (options=({})) => {
     .then(doc => {
       const policies = doc.privacy_policies;
       if (!policies || !Object.keys(policies).length) { // invalid doc
-        throw new Error(`Invalid ${PRIVACY_POLICY_DOC_ID} doc: missing required "privacy_policies" property`);
+        throw new NotFoundError(`Invalid ${PRIVACY_POLICY_DOC_ID} doc: missing required "privacy_policies" property`);
       }
       return doc;
     })
diff --git a/api/src/services/records.js b/api/src/services/records.js
index b6edb7d15a7..625994975a6 100644
--- a/api/src/services/records.js
+++ b/api/src/services/records.js
@@ -3,7 +3,7 @@ const phoneNumber = require('@medic/phone-number');
 const config = require('../config');
 const smsparser = require('./report/smsparser');
 const validate = require('./report/validate');
-const PublicError = require('../public-error');
+const { PublicError } = require('../errors');
 const DATE_NUMBER_STRING = /(\d{13,})/;
 
 // matches invisible characters that can mess up our parsing
diff --git a/api/src/services/setup/view-indexer.js b/api/src/services/setup/view-indexer.js
index 7055f867f80..6dac3ff3476 100644
--- a/api/src/services/setup/view-indexer.js
+++ b/api/src/services/setup/view-indexer.js
@@ -66,7 +66,6 @@ const indexView = async (dbName, ddocId, viewName) => {
         uri: `${environment.serverUrl}/${dbName}/${ddocId}/_view/${viewName}`,
         json: true,
         qs: { limit: 1 },
-        timeout: 2000,
       });
     } catch (requestError) {
       if (!continueIndexing) {
diff --git a/api/src/translations.js b/api/src/translations.js
index 7c2c2bd64f3..a2da98857b5 100644
--- a/api/src/translations.js
+++ b/api/src/translations.js
@@ -23,7 +23,8 @@ const LOCAL_NAME_MAP = {
   sw: 'Kiswahili (Swahili)',
   hi: 'हिन्दी (Hindi)',
   id: 'Bahasa Indonesia (Indonesian)',
-  lg: 'Luganda (Ganda)'
+  lg: 'Luganda (Ganda)',
+  ar: 'عربي (Arabic)'
 };
 
 const extractLocaleCode = filename => {
diff --git a/api/tests/mocha/services/privacy-policy.spec.js b/api/tests/mocha/services/privacy-policy.spec.js
index 6bc4315ff4e..6aecab9956d 100644
--- a/api/tests/mocha/services/privacy-policy.spec.js
+++ b/api/tests/mocha/services/privacy-policy.spec.js
@@ -3,6 +3,7 @@ const sinon = require('sinon');
 const service = require('../../../src/services/privacy-policy');
 const db = require('../../../src/db');
 const config = require('../../../src/config');
+const logger = require('@medic/logger');
 
 describe('Privacy Policy service', () => {
 
@@ -123,6 +124,27 @@ describe('Privacy Policy service', () => {
       });
     });
 
+    it('should throw error when doc does not exist', async () => {
+      sinon.spy(logger, 'error');
+      sinon.stub(db.medic, 'get').rejects({ status: 404 });
+      await chai.expect(service.get('sw')).to.be.rejected.and.eventually.deep.equal({ status: 404 });
+      chai.expect(logger.error.called).to.equal(false);
+    });
+
+    it('should throw error when doc has no policies', async () => {
+      sinon.stub(db.medic, 'get').resolves({ privacy_policies: {} });
+      sinon.spy(logger, 'error');
+      await chai.expect(service.get('sw')).to.be.rejected.and.eventually.deep.include({ status: 404 });
+      chai.expect(logger.error.called).to.equal(false);
+    });
+
+    it('should throw error on misconfigured doc', async () => {
+      sinon.stub(db.medic, 'get').resolves({ });
+      sinon.spy(logger, 'error');
+      await chai.expect(service.get('sw')).to.be.rejected.and.eventually.deep.include({ status: 404 });
+      chai.expect(logger.error.called).to.equal(false);
+    });
+
   });
 
 });
diff --git a/api/tests/mocha/services/setup/view-indexer.spec.js b/api/tests/mocha/services/setup/view-indexer.spec.js
index c61787d0870..098a53601d1 100644
--- a/api/tests/mocha/services/setup/view-indexer.spec.js
+++ b/api/tests/mocha/services/setup/view-indexer.spec.js
@@ -6,7 +6,8 @@ const db = require('../../../../src/db');
 const env = require('@medic/environment');
 const request = require('@medic/couch-request');
 const databases = require('../../../../src/services/setup/databases');
-const upgradeLogService = require('../../../../src/services/setup/upgrade-log');
+const upgradeLogService = require('../../../../src/service' +
+                                  's/setup/upgrade-log');
 
 let viewIndexer;
 
@@ -60,38 +61,33 @@ describe('View indexer service', () => {
           uri: 'http://localhost/thedb/_design/:staged:one/_view/view1',
           json: true,
           qs: { limit: 1 },
-          timeout: 2000,
         }],
         [{
           uri: 'http://localhost/thedb/_design/:staged:one/_view/view2',
           json: true,
           qs: { limit: 1 },
-          timeout: 2000,
         }],
         [{
           uri: 'http://localhost/thedb/_design/:staged:one/_view/view3',
           json: true,
           qs: { limit: 1 },
-          timeout: 2000,
         }],
         [{
           uri: 'http://localhost/thedb/_design/:staged:three/_view/view4',
           json: true,
           qs: { limit: 1 },
-          timeout: 2000,
         }],
         [{
           uri: 'http://localhost/thedb-users-meta/_design/:staged:four/_view/view',
           json: true,
           qs: { limit: 1 },
-          timeout: 2000,
         }],
       ]);
     });
   });
 
   describe('indexView', () => {
-    it('should query the view with a timeout', async () => {
+    it('should query the view', async () => {
       sinon.stub(request, 'get').resolves();
       sinon.stub(env, 'serverUrl').value('http://localhost');
 
@@ -102,7 +98,6 @@ describe('View indexer service', () => {
         uri: 'http://localhost/medic/_design/:staged:medic/_view/contacts',
         json: true,
         qs: { limit: 1 },
-        timeout: 2000,
       }]);
     });
 
@@ -119,7 +114,6 @@ describe('View indexer service', () => {
         uri: 'http://localhost/other/_design/mydesign/_view/viewname',
         json: true,
         qs: { limit: 1 },
-        timeout: 2000,
       };
       expect(request.get.args).to.deep.equal(Array.from({ length: 21 }).map(() => [params]));
     });
@@ -137,7 +131,6 @@ describe('View indexer service', () => {
         uri: 'http://localhost/other/_design/mydesign/_view/viewname',
         json: true,
         qs: { limit: 1 },
-        timeout: 2000,
       };
       expect(request.get.args).to.deep.equal(Array.from({ length: 21 }).map(() => [params]));
     });
diff --git a/couchdb/10-docker-default.ini b/couchdb/10-docker-default.ini
index 92e42a2863e..8c924a92d54 100644
--- a/couchdb/10-docker-default.ini
+++ b/couchdb/10-docker-default.ini
@@ -11,6 +11,7 @@ os_process_timeout = 60000
 max_dbs_open = 5000
 attachment_stream_buffer_size = 16384
 max_document_size = 4294967296 ; 4 GB
+changes_doc_ids_optimization_threshold = 40000
 
 [chttpd]
 port = 5984
diff --git a/couchdb/Dockerfile b/couchdb/Dockerfile
index 2baa33c424a..2afba060d56 100644
--- a/couchdb/Dockerfile
+++ b/couchdb/Dockerfile
@@ -1,4 +1,4 @@
-FROM couchdb:3.3.3 as base_couchdb_build
+FROM couchdb:3.4.2 as base_couchdb_build
 
 COPY --chown=couchdb:couchdb 10-docker-default.ini /opt/couchdb/etc/default.d/
 COPY --chown=couchdb:couchdb vm.args /opt/couchdb/etc/
diff --git a/package-lock.json b/package-lock.json
index 819b0b5e2aa..40658d10f43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "medic",
-  "version": "4.14.0",
+  "version": "4.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "medic",
-      "version": "4.14.0",
+      "version": "4.15.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
       "workspaces": [
@@ -19,7 +19,7 @@
         "bowser": "^2.11.0",
         "buffer-shims": "^1.0.0",
         "cht-nootils": "^4.2.0",
-        "compression": "^1.7.4",
+        "compression": "^1.7.5",
         "cron-validator": "^1.3.1",
         "epi-week": "^0.0.1",
         "express": "^4.21.1",
@@ -169,8 +169,8 @@
         "xml-js": "^1.6.11"
       },
       "engines": {
-        "node": ">=20.11.0",
-        "npm": ">=10.2.4"
+        "node": ">=22.11.0",
+        "npm": ">=10.9.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -14005,14 +14005,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -14461,9 +14453,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -16344,16 +16336,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -16373,10 +16365,13 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    "node_modules/compression/node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -31150,14 +31145,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/raw-loader": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
diff --git a/package.json b/package.json
index 43e9019ccce..70cd07cc139 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic",
-  "version": "4.14.0",
+  "version": "4.15.0",
   "private": true,
   "license": "AGPL-3.0-only",
   "repository": {
@@ -53,7 +53,8 @@
     "unit-haproxy-healthcheck": "cd haproxy-healthcheck && make test",
     "unit-cht-deploy": "cd scripts/deploy && npm test",
     "wdio-default-mobile-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default-mobile/wdio.conf.js --suite=all",
-    "wdio-visual-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=all",
+    "wdio-visual-desktop": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=desktopTests",
+    "wdio-visual-mobile": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=mobileTests",
     "wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
     "apdex-test": "wdio run ./tests/performance/apdex-score/wdio.conf.js",
     "-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
@@ -179,7 +180,7 @@
     "bowser": "^2.11.0",
     "buffer-shims": "^1.0.0",
     "cht-nootils": "^4.2.0",
-    "compression": "^1.7.4",
+    "compression": "^1.7.5",
     "cron-validator": "^1.3.1",
     "epi-week": "^0.0.1",
     "express": "^4.21.1",
diff --git a/scripts/build/versions.js b/scripts/build/versions.js
index a1ed5be17eb..31128aeb1a2 100644
--- a/scripts/build/versions.js
+++ b/scripts/build/versions.js
@@ -1,5 +1,5 @@
 const packageJson = require('../../package.json');
-const buildTime = new Date().getTime();
+const { execSync } = require('child_process');
 
 const {
   ECR_REPO,
@@ -46,7 +46,7 @@ const getVersion = (release) => {
     return process.env.VERSION;
   }
 
-  return `${packageJson.version}-dev.${buildTime}`;
+  return execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
 };
 
 const getImageTag = (service, release = false) => {
diff --git a/scripts/docker-helper-4.x/cht-docker-compose.sh b/scripts/docker-helper-4.x/cht-docker-compose.sh
index 7c56cc8602b..1cc3baccbdc 100755
--- a/scripts/docker-helper-4.x/cht-docker-compose.sh
+++ b/scripts/docker-helper-4.x/cht-docker-compose.sh
@@ -398,7 +398,7 @@ if [[ -z "$projectName" ]]; then
 
   echo
   # thanks for the pr vs rp!! https://unix.stackexchange.com/a/677805
-  read -rp "Would you like to initialize a new project [y/N]?" yn
+  read -rp "Would you like to initialize a new project [y/N]? " yn
   case $yn in
   [Yy]*)
     while [[ -z "$projectName" ]]; do
@@ -408,10 +408,19 @@ if [[ -z "$projectName" ]]; then
       case $runLatest in
       [nN]*)
         allKnownVersions=$(get_all_known_versions)
+        optionCount=$(wc -l <<< "$allKnownVersions")
         echo
-        echo "Which version to you want to run? (ctrl + c to quit)"
-        select preferredRelease in $allKnownVersions; do
-          break
+        echo "Select a version by entering 1 through ${optionCount} or 'ctrl + c' to quit: "
+        while true; do
+          select preferredRelease in $allKnownVersions; do
+            if [[ "$REPLY" =~ ^[0-9]+$ && "$REPLY" -gt 0 && "$REPLY" -lt $optionCount ]]; then
+              echo
+              echo "Selected version ${preferredRelease}";
+              break 2;
+            else
+              echo "Invalid choice. Enter 1 through ${optionCount} or 'ctrl + c' to quit"
+            fi
+          done
         done
       esac
       echo
diff --git a/sentinel/server.js b/sentinel/server.js
index e2c62fa7807..df5057a732f 100755
--- a/sentinel/server.js
+++ b/sentinel/server.js
@@ -35,20 +35,26 @@ const waitForApi = () => new Promise(resolve => {
 });
 
 logger.info('Running server checks...');
-serverChecks
-  .check(environment.couchUrl)
-  .then(waitForApi)
-  .then(() => {
-    // Even requiring this boots translations, so has to be required after
-    // api has booted
+
+(async () => {
+  try {
+    await serverChecks.check(environment.couchUrl);
+    await waitForApi();
+
     const config = require('./src/config');
-    return config.init().then(() => {
-      require('./src/schedule').init();
-      logger.info('startup complete.');
-    });
-  })
-  .catch(err => {
-    logger.error('Fatal error intialising sentinel');
+    await config.init();
+
+    const schedule = require('./src/schedule');
+    schedule.init();
+
+    logger.info('startup complete.');
+
+    const processHooks = require('./src/process-hooks');
+    processHooks.init();
+
+  } catch (err) {
+    logger.error('Fatal error initialising sentinel');
     logger.error('%o', err);
     process.exit(1);
-  });
+  }
+})();
diff --git a/sentinel/src/lib/feed.js b/sentinel/src/lib/feed.js
index bbd93562450..e688802d1cd 100644
--- a/sentinel/src/lib/feed.js
+++ b/sentinel/src/lib/feed.js
@@ -15,6 +15,7 @@ const MAX_QUEUE_SIZE = 100;
 
 let request;
 let processed = 0;
+let processing;
 
 const enqueue = change => changeQueue.push(change);
 
@@ -100,33 +101,34 @@ changeQueue.drain(() => {
   resumeProcessing();
 });
 
+/**
+ * Start listening from the last processed seq. Will restart
+ * automatically on error.
+ */
 const listen = () => {
+  logger.info('Starting transition processing');
+  processing = true;
   changeQueue.resume();
   return resumeProcessing();
 };
 
-module.exports = {
+/**
+ * Stops listening for changes. Must be restarted manually
+ * by calling listen.
+ */
+const cancel =  () => {
+  logger.info('Suspending transition processing');
+  processing = false;
+  changeQueue.pause();
+  if (request) {
+    request.cancel && request.cancel();
+    request = null;
+  }
+};
 
-  /**
-   * Start listening from the last processed seq. Will restart
-   * automatically on error.
-   */
+module.exports = {
   listen,
+  cancel,
 
-  /**
-   * Stops listening for changes. Must be restarted manually
-   * by calling listen.
-   */
-  cancel: () => {
-    changeQueue.pause();
-    if (request) {
-      request.cancel && request.cancel();
-      request = null;
-    }
-  },
-
-  // exposed for testing
-  _changeQueue: changeQueue,
-  _transitionsLib: transitionsLib,
-  _enqueue: enqueue,
+  toggle: () => processing ? cancel() : listen()
 };
diff --git a/sentinel/src/process-hooks.js b/sentinel/src/process-hooks.js
new file mode 100644
index 00000000000..d14e088ea68
--- /dev/null
+++ b/sentinel/src/process-hooks.js
@@ -0,0 +1,13 @@
+const feed = require('./lib/feed');
+const schedule = require('./schedule');
+
+module.exports = {
+  init: () => {
+    process.on('SIGUSR1', () => {
+      feed.toggle();
+    });
+    process.on('SIGUSR2', () => {
+      schedule.runTasks();
+    });
+  }
+};
diff --git a/sentinel/src/schedule/index.js b/sentinel/src/schedule/index.js
index 928d8abe8bb..c717949bd32 100644
--- a/sentinel/src/schedule/index.js
+++ b/sentinel/src/schedule/index.js
@@ -72,3 +72,4 @@ exports.init = () => {
   runTasks();
   interval = setInterval(runTasks, RUN_EVERY_MS);
 };
+exports.runTasks = runTasks;
diff --git a/sentinel/src/transitions.js b/sentinel/src/transitions.js
index 5a5758a90d0..b0e56fd2a68 100644
--- a/sentinel/src/transitions.js
+++ b/sentinel/src/transitions.js
@@ -20,8 +20,5 @@ module.exports = {
   /**
    * Loads the transitions and starts watching for db changes.
    */
-  loadTransitions: loadTransitions,
-
-  // exposed for testing
-  _transitionsLib: transitionsLib,
+  loadTransitions,
 };
diff --git a/sentinel/tests/unit/lib/feed.spec.js b/sentinel/tests/unit/lib/feed.spec.js
index 3481a15ad84..d571a029509 100644
--- a/sentinel/tests/unit/lib/feed.spec.js
+++ b/sentinel/tests/unit/lib/feed.spec.js
@@ -3,9 +3,9 @@ config.initTransitionLib();
 
 const sinon = require('sinon');
 const chai = require('chai');
-const assert = require('chai').assert;
+const rewire = require('rewire');
+
 const db = require('../../../src/db');
-const feed = require('../../../src/lib/feed');
 const metadata = require('../../../src/lib/metadata');
 const logger = require('@medic/logger');
 const tombstoneUtils = require('@medic/tombstone-utils');
@@ -14,6 +14,12 @@ const changeRetryHistory = require('../../../src/lib/change-retry-history');
 describe('feed', () => {
 
   let handler;
+  let feed;
+  let changeQueue;
+  const realSetTimeout = setTimeout;
+  const nextTick = () => new Promise(resolve => realSetTimeout(() => resolve()));
+
+  let clock;
 
   beforeEach(() => {
     handler = {
@@ -22,7 +28,10 @@ describe('feed', () => {
     handler.catch = sinon.stub().returns(handler);
     handler.on = sinon.stub().returns(handler);
     sinon.stub(db.medic, 'changes').returns(handler);
-    feed._changeQueue.resume();
+    clock = sinon.useFakeTimers();
+    feed = rewire('../../../src/lib/feed');
+    changeQueue = feed.__get__('changeQueue');
+    changeQueue.resume();
   });
 
   afterEach(() => {
@@ -61,15 +70,12 @@ describe('feed', () => {
     });
 
     it('restarts listener after db error', () => {
-      const realSetTimeout = setTimeout;
-      const nextTick = () => new Promise(resolve => realSetTimeout(() => resolve()));
-      const clock = sinon.useFakeTimers();
       const change = { id: 'some-uuid' };
       sinon.stub(metadata, 'getTransitionSeq')
         .onCall(0).resolves('123')
         .onCall(1).resolves('456');
 
-      const push = sinon.stub(feed._changeQueue, 'push');
+      const push = sinon.stub(changeQueue, 'push');
       return feed
         .listen()
         .then(() => {
@@ -106,8 +112,9 @@ describe('feed', () => {
       const change = { id: 'some-uuid' };
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
       sinon.stub(tombstoneUtils, 'isTombstoneId').returns(false);
-      sinon.stub(feed._changeQueue, 'length').returns(0);
-      const push = sinon.stub(feed._changeQueue, 'push');
+      
+      sinon.stub(changeQueue, 'length').returns(0);
+      const push = sinon.stub(changeQueue, 'push');
 
       return feed
         .listen()
@@ -126,8 +133,8 @@ describe('feed', () => {
       const edoc = { id: 'some-uuid' };
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
       sinon.stub(tombstoneUtils, 'isTombstoneId').returns(false);
-      sinon.stub(feed._changeQueue, 'length').returns(0);
-      const push = sinon.stub(feed._changeQueue, 'push');
+      sinon.stub(changeQueue, 'length').returns(0);
+      const push = sinon.stub(changeQueue, 'push');
       return feed
         .listen()
         .then(() => {
@@ -147,7 +154,7 @@ describe('feed', () => {
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
       sinon.stub(tombstoneUtils, 'isTombstoneId').returns(false);
 
-      const push = sinon.stub(feed._changeQueue, 'push');
+      const push = sinon.stub(changeQueue, 'push');
       return feed
         .listen()
         .then(() => {
@@ -169,7 +176,7 @@ describe('feed', () => {
         .withArgs(tombstone.id).returns(true)
         .withArgs(doc.id).returns(false);
 
-      const push = sinon.stub(feed._changeQueue, 'push');
+      const push = sinon.stub(changeQueue, 'push');
       return feed
         .listen()
         .then(() => {
@@ -192,7 +199,7 @@ describe('feed', () => {
         .withArgs(doc1).returns(false)
         .withArgs(doc2).returns(true);
 
-      const push = sinon.stub(feed._changeQueue, 'push');
+      const push = sinon.stub(changeQueue, 'push');
       return feed
         .listen()
         .then(() => {
@@ -211,8 +218,8 @@ describe('feed', () => {
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
       sinon.stub(tombstoneUtils, 'isTombstoneId').returns(false);
 
-      sinon.stub(feed._changeQueue, 'length').returns(101);
-      const push = sinon.stub(feed._changeQueue, 'push');
+      sinon.stub(changeQueue, 'length').returns(101);
+      const push = sinon.stub(changeQueue, 'push');
 
       return feed
         .listen()
@@ -232,8 +239,8 @@ describe('feed', () => {
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
       sinon.stub(tombstoneUtils, 'isTombstoneId').returns(false);
       const change = { id: 'some-uuid' };
-      sinon.stub(feed._changeQueue, 'push');
-      sinon.spy(feed._changeQueue, 'resume');
+      sinon.stub(changeQueue, 'push');
+      sinon.spy(changeQueue, 'resume');
 
       return feed
         .listen()
@@ -242,9 +249,9 @@ describe('feed', () => {
           callbackFn(change);
         })
         .then(() => {
-          chai.expect(feed._changeQueue.resume.callCount).to.equal(1);
-          chai.expect(feed._changeQueue.push.callCount).to.equal(1);
-          chai.expect(feed._changeQueue.push.args[0][0]).to.deep.equal(change);
+          chai.expect(changeQueue.resume.callCount).to.equal(1);
+          chai.expect(changeQueue.push.callCount).to.equal(1);
+          chai.expect(changeQueue.push.args[0][0]).to.deep.equal(change);
         });
     });
   });
@@ -253,16 +260,17 @@ describe('feed', () => {
 
     it('cancels the couch request', () => {
       sinon.stub(metadata, 'getTransitionSeq').resolves('123');
-
-      const push = sinon.stub(feed._changeQueue, 'push');
+      const changeQueue = feed.__get__('changeQueue');
+      sinon.stub(changeQueue, 'push');
+      
       const change = { id: 'some-uuid' };
-      sinon.spy(feed._changeQueue, 'pause');
+      sinon.spy(changeQueue, 'pause');
 
       return feed
         .listen()
         .then(() => feed.cancel())
         .then(() => {
-          chai.expect(feed._changeQueue.pause.callCount).to.equal(1);
+          chai.expect(changeQueue.pause.callCount).to.equal(1);
           chai.expect(handler.cancel.callCount).to.equal(1);
           // resume listening
           return feed.listen();
@@ -272,32 +280,53 @@ describe('feed', () => {
           callbackFn(change);
         })
         .then(() => {
-          chai.expect(push.callCount).to.equal(1);
-          chai.expect(push.args[0][0]).to.deep.equal(change);
+          chai.expect(changeQueue.push.callCount).to.equal(1);
+          chai.expect(changeQueue.push.args[0][0]).to.deep.equal(change);
         });
     });
 
   });
 
+  describe('toggle', () => {
+    beforeEach(() => {
+      feed.__set__('cancel', sinon.stub());
+      feed.__set__('listen', sinon.stub());
+    });
+
+    it('should stop feed if started', () => {
+      feed.__set__('processing', true);
+      feed.toggle();
+      chai.expect(feed.__get__('cancel').called).to.equal(true);
+      chai.expect(feed.__get__('listen').called).to.equal(false);
+    });
+
+    it('should start feed if stopped', () => {
+      feed.toggle();
+      chai.expect(feed.__get__('cancel').called).to.equal(false);
+      chai.expect(feed.__get__('listen').called).to.equal(true);
+    });
+  });
+
   describe('changeQueue', () => {
     it('should not resume feed if drain happens while queue is paused', (done) => {
       let resolvePromise;
       const delayedPromise = new Promise(resolve => resolvePromise = resolve);
-      sinon.stub(feed._transitionsLib, 'processChange').callsFake((change, cb) => {
+      const transitionsLib = feed.__get__('transitionsLib');
+      sinon.stub(transitionsLib, 'processChange').callsFake((change, cb) => {
         return delayedPromise.then(() => cb());
       });
       sinon.spy(logger, 'debug');
-      sinon.spy(feed._changeQueue, 'resume');
+      sinon.spy(changeQueue, 'resume');
       sinon.stub(metadata, 'getTransitionSeq').resolves();
       sinon.stub(metadata, 'setTransitionSeq').resolves();
 
-      feed._enqueue({ id: 'somechange', seq: 65558 });
-      feed._changeQueue.process();
+      feed.__get__('enqueue')({ id: 'somechange', seq: 65558 });
+      changeQueue.process();
       feed.cancel(); // feed is now canceled
       resolvePromise(); // queue is now drained
-      setTimeout(() => {
+      realSetTimeout(() => {
         chai.expect(logger.debug.withArgs('transitions: queue drained').callCount).to.equal(1);
-        chai.expect(feed._changeQueue.resume.callCount).to.equal(0);
+        chai.expect(changeQueue.resume.callCount).to.equal(0);
         chai.expect(metadata.setTransitionSeq.callCount).to.equal(1);
         chai.expect(metadata.setTransitionSeq.args[0]).to.deep.equal([65558]);
         chai.expect(metadata.getTransitionSeq.callCount).to.equal(1); // we get the seq anyway
@@ -307,20 +336,19 @@ describe('feed', () => {
     });
 
     it('handles an empty change', done => {
-      sinon.stub(feed._changeQueue, 'length').returns(0);
+      sinon.stub(changeQueue, 'length').returns(0);
       sinon.stub(metadata, 'setTransitionSeq').resolves();
-      sinon.stub(feed._transitionsLib, 'processChange').callsArgWith(1);
+      const transitionsLib = feed.__get__('transitionsLib');
+      sinon.stub(transitionsLib, 'processChange').callsArgWith(1);
 
-      feed._enqueue();
+      feed.__get__('enqueue')();
 
-      feed._changeQueue.drain(() => {
-        return Promise.resolve().then(() => {
-          assert.equal(feed._transitionsLib.processChange.callCount, 0);
-          return Promise.resolve().then(() => {
-            assert.equal(metadata.setTransitionSeq.callCount, 0);
-            done();
-          });
-        });
+      changeQueue.drain(async () => {
+        await Promise.resolve();
+        chai.expect(transitionsLib.processChange.called).to.equal(false);
+        await Promise.resolve();
+        chai.expect(metadata.setTransitionSeq.called).to.equal(false);
+        done();
       });
     });
 
@@ -328,33 +356,36 @@ describe('feed', () => {
       sinon.stub(metadata, 'setTransitionSeq').resolves();
       sinon.stub(db, 'allDbs').resolves([]);
 
-      feed._enqueue({ id: 'somechange', seq: 55, deleted: true });
+      feed.__get__('enqueue')({ id: 'somechange', seq: 55, deleted: true });
 
-      feed._changeQueue.drain(() => {
-        return Promise.resolve().then(() => {
-          assert.equal(metadata.setTransitionSeq.callCount, 1);
-          assert.equal(metadata.setTransitionSeq.args[0][0], 55);
-          done();
-        });
+      changeQueue.drain(async () => {
+        await Promise.resolve();
+
+        chai.expect(metadata.setTransitionSeq.calledOnce).to.equal(true);
+        chai.expect(metadata.setTransitionSeq.args[0][0]).to.deep.equal(55);
+        done();
       });
     });
 
     it('runs transitions lib over changes', done => {
       sinon.stub(metadata, 'setTransitionSeq').resolves();
-      sinon.stub(feed._transitionsLib, 'processChange').callsArgWith(1);
-
-      feed._enqueue({ id: 'somechange', seq: 55 });
-
-      feed._changeQueue.drain(() => {
-        return Promise.resolve().then(() => {
-          assert.equal(feed._transitionsLib.processChange.callCount, 1);
-          assert.deepEqual(feed._transitionsLib.processChange.args[0][0], { id: 'somechange', seq: 55 });
-          return Promise.resolve().then(() => {
-            assert.equal(metadata.setTransitionSeq.callCount, 1);
-            assert.equal(metadata.setTransitionSeq.args[0][0], 55);
-            done();
-          });
-        });
+      sinon.stub(feed.__get__('transitionsLib'), 'processChange').callsArgWith(1);
+
+      feed.__get__('enqueue')({ id: 'somechange', seq: 55 });
+
+      changeQueue.drain(async () => {
+        await Promise.resolve();
+
+        chai.expect(feed.__get__('transitionsLib').processChange.calledOnce).to.equal(true);
+        chai.expect(feed.__get__('transitionsLib').processChange.args[0][0])
+          .to.deep.equal({ id: 'somechange', seq: 55 });
+
+        await Promise.resolve();
+
+        chai.expect(metadata.setTransitionSeq.calledOnce).to.equal(true);
+        chai.expect(metadata.setTransitionSeq.args[0][0]).to.deep.equal(55);
+
+        done();
       });
     });
   });
diff --git a/sentinel/tests/unit/transitions.spec.js b/sentinel/tests/unit/transitions.spec.js
index 6470ee15e33..1413b7f6538 100644
--- a/sentinel/tests/unit/transitions.spec.js
+++ b/sentinel/tests/unit/transitions.spec.js
@@ -1,28 +1,43 @@
 const config = require('../../src/config');
 config.initTransitionLib();
+const rewire = require('rewire');
 
 const sinon = require('sinon');
-const assert = require('chai').assert;
-const transitions = require('../../src/transitions');
+const expect = require('chai').expect;
 const feed = require('../../src/lib/feed');
+let transitions;
 
 describe('transitions', () => {
   afterEach(() => {
     sinon.restore();
   });
 
+  beforeEach(() => {
+    transitions = rewire('../../src/transitions');
+    sinon.stub(feed, 'listen');
+    sinon.stub(feed, 'cancel');
+  });
+
   describe('loadTransitions', () => {
+    it('Should load all transitions', () => {
+      const transitionsLib =  { loadTransitions: sinon.stub() };
+      transitions.__set__('transitionsLib', transitionsLib);
 
-    it('cancel is called when load throws', () => {
-      const load = sinon.stub(transitions._transitionsLib, 'loadTransitions').throws();
-      const listen = sinon.stub(feed, 'listen');
-      const cancel = sinon.stub(feed, 'cancel');
       transitions.loadTransitions();
-      assert.equal(load.callCount, 1);
-      assert.equal(listen.callCount, 0);
-      assert.equal(cancel.callCount, 1);
+      expect(transitionsLib.loadTransitions.calledOnce).to.equal(true);
+      expect(feed.listen.called).to.equal(true);
+      expect(feed.cancel.calledOnce).to.equal(false);
     });
 
-  });
+    it('cancel is called when load throws', () => {
+      const transitionsLib =  { loadTransitions: sinon.stub().throws() };
+      transitions.__set__('transitionsLib', transitionsLib);
 
+      transitions.loadTransitions();
+
+      expect(transitionsLib.loadTransitions.calledOnce).to.equal(true);
+      expect(feed.listen.called).to.equal(false);
+      expect(feed.cancel.calledOnce).to.equal(true);
+    });
+  });
 });
diff --git a/shared-libs/rules-engine/src/pouchdb-provider.js b/shared-libs/rules-engine/src/pouchdb-provider.js
index f560c60cb7b..512a6433ba1 100644
--- a/shared-libs/rules-engine/src/pouchdb-provider.js
+++ b/shared-libs/rules-engine/src/pouchdb-provider.js
@@ -52,15 +52,14 @@ const medicPouchProvider = db => {
         .then(([contactDocs, reportDocs, taskDocs]) => ({ contactDocs, reportDocs, taskDocs, userSettingsId }));
     },
 
-    contactsBySubjectId: subjectIds => {
+    contactsBySubjectId: async (subjectIds) => {
       const keys = subjectIds.map(key => ['shortcode', key]);
-      return dbQuery('medic-client/contacts_by_reference', { keys, include_docs: true })
-        .then(results => {
-          const shortcodeIds = results.rows.map(result => result.doc._id);
-          const idsThatArentShortcodes = subjectIds.filter(id => !results.rows.map(row => row.key[1]).includes(id));
+      const results = await db.query('medic-client/contacts_by_reference', { keys, include_docs: true });
 
-          return [...shortcodeIds, ...idsThatArentShortcodes];
-        });
+      const shortcodeIds = results.rows.map(result => result.doc._id);
+      const idsThatArentShortcodes = subjectIds.filter(id => !results.rows.map(row => row.key[1]).includes(id));
+
+      return [...shortcodeIds, ...idsThatArentShortcodes];
     },
 
     stateChangeCallback: docUpdateClosure(db),
@@ -82,6 +81,7 @@ const medicPouchProvider = db => {
               reporting_period: docTag,
             };
           }
+          throw err;
         })
         .then(existingDoc => {
           if (!updatedTargets && existingDoc._rev) {
@@ -125,40 +125,35 @@ const medicPouchProvider = db => {
       return rowsOf(dbQuery( 'medic-client/tasks_by_contact', options));
     },
 
-    taskDataFor: (contactIds, userSettingsDoc) => {
+    taskDataFor: async (contactIds, userSettingsDoc) => {
       if (!contactIds || contactIds.length === 0) {
-        return Promise.resolve({});
+        return {};
       }
 
-      return docsOf(db.allDocs({ keys: contactIds, include_docs: true }))
-        .then(contactDocs => {
-          const subjectIds = contactDocs.reduce((agg, contactDoc) => {
-            registrationUtils.getSubjectIds(contactDoc).forEach(subjectId => agg.add(subjectId));
-            return agg;
-          }, new Set(contactIds));
-
-          const keys = Array.from(subjectIds);
-          return Promise
-            .all([
-              docsOf(dbQuery('medic-client/reports_by_subject', { keys, include_docs: true })),
-              self.tasksByRelation(contactIds, 'requester'),
-            ])
-            .then(([reportDocs, taskDocs]) => {
-              // tighten the connection between reports and contacts
-              // a report will only be allowed to generate tasks for a single contact!
-              reportDocs = reportDocs.filter(report => {
-                const subjectId = registrationUtils.getSubjectId(report);
-                return subjectIds.has(subjectId);
-              });
-
-              return {
-                userSettingsId: userSettingsDoc?._id,
-                contactDocs,
-                reportDocs,
-                taskDocs,
-              };
-            });
-        });
+      const contactDocs = await docsOf(db.allDocs({ keys: contactIds, include_docs: true }));
+      const subjectIds = contactDocs.reduce((agg, contactDoc) => {
+        registrationUtils.getSubjectIds(contactDoc).forEach(subjectId => agg.add(subjectId));
+        return agg;
+      }, new Set(contactIds));
+
+      const keys = Array.from(subjectIds);
+
+      const [reportDocs, taskDocs] = await Promise.all([
+        docsOf(dbQuery('medic-client/reports_by_subject', { keys, include_docs: true })),
+        self.tasksByRelation(contactIds, 'requester'),
+      ]);
+
+      const relevantReportDocs = reportDocs.filter(report => {
+        const subjectId = registrationUtils.getSubjectId(report);
+        return subjectIds.has(subjectId);
+      });
+
+      return {
+        userSettingsId: userSettingsDoc?._id,
+        contactDocs,
+        reportDocs: relevantReportDocs,
+        taskDocs,
+      };
     },
   };
 
diff --git a/shared-libs/rules-engine/src/provider-wireup.js b/shared-libs/rules-engine/src/provider-wireup.js
index 09812430b05..3747e5233f2 100644
--- a/shared-libs/rules-engine/src/provider-wireup.js
+++ b/shared-libs/rules-engine/src/provider-wireup.js
@@ -12,7 +12,6 @@ const refreshRulesEmissions = require('./refresh-rules-emissions');
 const rulesEmitter = require('./rules-emitter');
 const rulesStateStore = require('./rules-state-store');
 const updateTemporalStates = require('./update-temporal-states');
-const calendarInterval = require('@medic/calendar-interval');
 
 let wireupOptions;
 
@@ -31,7 +30,7 @@ module.exports = {
    * @param {number} settings.monthStartDate reporting interval start date
    * @param {Object} userDoc User's hydrated contact document
    */
-  initialize: (provider, settings) => {
+  initialize: async (provider, settings) => {
     const isEnabled = rulesEmitter.initialize(settings);
     if (!isEnabled) {
       return Promise.resolve();
@@ -40,26 +39,21 @@ module.exports = {
     const { enableTasks=true, enableTargets=true } = settings;
     wireupOptions = { enableTasks, enableTargets };
 
-    return provider
-      .existingRulesStateStore()
-      .then(existingStateDoc => {
-        if (!rulesEmitter.isLatestNoolsSchema()) {
-          throw Error('Rules Engine: Updates to the nools schema are required');
-        }
+    const existingStateDoc = await provider.existingRulesStateStore();
+    if (!rulesEmitter.isLatestNoolsSchema()) {
+      throw Error('Rules Engine: Updates to the nools schema are required');
+    }
 
-        const contactClosure = updatedState => provider.stateChangeCallback(
-          existingStateDoc,
-          { rulesStateStore: updatedState }
-        );
-        const needsBuilding = rulesStateStore.load(existingStateDoc.rulesStateStore, settings, contactClosure);
-        return handleIntervalTurnover(provider, settings).then(() => {
-          if (!needsBuilding) {
-            return;
-          }
-
-          rulesStateStore.build(settings, contactClosure);
-        });
-      });
+    const contactClosure = updatedState => provider.stateChangeCallback(
+      existingStateDoc,
+      { rulesStateStore: updatedState }
+    );
+    const needsBuilding = rulesStateStore.load(existingStateDoc.rulesStateStore, settings, contactClosure);
+    if (!needsBuilding) {
+      return;
+    }
+
+    rulesStateStore.build(settings, contactClosure);
   },
 
   /**
@@ -273,20 +267,18 @@ const refreshRulesEmissionForContacts = (provider, calculationTimestamp, contact
       });
   };
 
-  return handleIntervalTurnover(provider, { monthStartDate: rulesStateStore.getMonthStartDate() }).then(() => {
-    if (contactIds) {
-      return refreshForKnownContacts(calculationTimestamp, contactIds);
-    }
+  if (contactIds) {
+    return refreshForKnownContacts(calculationTimestamp, contactIds);
+  }
 
-    // If the contact state store does not contain all contacts, build up that list (contact doc ids + headless ids in
-    // reports/tasks)
-    if (!rulesStateStore.hasAllContacts()) {
-      return refreshForAllContacts(calculationTimestamp);
-    }
+  // If the contact state store does not contain all contacts, build up that list (contact doc ids + headless ids in
+  // reports/tasks)
+  if (!rulesStateStore.hasAllContacts()) {
+    return refreshForAllContacts(calculationTimestamp);
+  }
 
-    // Once the contact state store has all contacts, trust it and only refresh those marked dirty
-    return refreshForKnownContacts(calculationTimestamp, rulesStateStore.getContactIds());
-  });
+  // Once the contact state store has all contacts, trust it and only refresh those marked dirty
+  return refreshForKnownContacts(calculationTimestamp, rulesStateStore.getContactIds());
 };
 
 const storeTargetsDoc = (provider, aggregate, updatedTargets) => {
@@ -305,28 +297,3 @@ const storeTargetsDoc = (provider, aggregate, updatedTargets) => {
   );
 };
 
-// This function takes the last saved state (which may be stale) and generates the targets doc for the corresponding
-// reporting interval (that includes the date when the state was calculated).
-// We don't recalculate the state prior to this because we support targets that count events infinitely to emit `now`,
-// which means that they would all be excluded from the emission filter (being outside the past reporting interval).
-// https://github.com/medic/cht-core/issues/6209
-const handleIntervalTurnover = async (provider, { monthStartDate }) => {
-  if (!rulesStateStore.isLoaded() || !wireupOptions.enableTargets) {
-    return Promise.resolve();
-  }
-
-  const stateCalculatedAt = rulesStateStore.stateLastUpdatedAt();
-  if (!stateCalculatedAt) {
-    return Promise.resolve();
-  }
-
-  const currentInterval = calendarInterval.getCurrent(monthStartDate);
-  // 4th parameter of isBetween represents inclusivity. By default or using ( is exclusive, [ is inclusive
-  if (moment(stateCalculatedAt).isBetween(currentInterval.start, currentInterval.end, null, '[]')) {
-    return Promise.resolve();
-  }
-
-  const filterInterval = calendarInterval.getInterval(monthStartDate, stateCalculatedAt);
-  const aggregate = await rulesStateStore.getTargetAggregates(filterInterval);
-  return storeTargetsDoc(provider, aggregate, true);
-};
diff --git a/shared-libs/rules-engine/test/integration.spec.js b/shared-libs/rules-engine/test/integration.spec.js
index 155bbbf53fd..d6d4874c646 100644
--- a/shared-libs/rules-engine/test/integration.spec.js
+++ b/shared-libs/rules-engine/test/integration.spec.js
@@ -9,7 +9,6 @@ const sinon = require('sinon');
 
 const RulesEngine = require('../src');
 const rulesEmitter = require('../src/rules-emitter');
-const calendarInterval = require('@medic/calendar-interval');
 
 const { expect } = chai;
 chai.use(chaiExclude);
@@ -259,18 +258,10 @@ describe(`Rules Engine Integration Tests`, () => {
         clock.setSystemTime(TEST_START + MS_IN_DAY * 39);
         const monthLater = await rulesEngine.fetchTasksFor(['patient']);
         expect(monthLater).to.have.property('length', 0);
-        expect(db.bulkDocs.callCount).to.eq(5);
-
-        // interval turnover
-        expect(db.bulkDocs.args[3][0].docs[0]).to.deep.include({
-          _id: `target~${TARGET_INTERVAL}~user~org.couchdb.user:username`,
-          type: 'target',
-          owner: 'user',
-          reporting_period: TARGET_INTERVAL,
-        });
+        expect(db.bulkDocs.callCount).to.eq(4);
 
         const dateNext = moment(TEST_START + MS_IN_DAY * 39).format('YYYY-MM');
-        expect(db.bulkDocs.args[4][0].docs[0]).to.deep.include({
+        expect(db.bulkDocs.args[3][0].docs[0]).to.deep.include({
           _id: `target~${dateNext}~user~org.couchdb.user:username`,
           type: 'target',
           owner: 'user',
@@ -692,70 +683,6 @@ describe(`Rules Engine Integration Tests`, () => {
           pass: 1,
         });
       });
-
-      it('targets on interval turnover only recalculates targets when interval changes', async () => {
-        const targetsSaved = () => {
-          const targets = [];
-          db.bulkDocs.args.forEach(([docs]) => {
-            if (!docs) {
-              return;
-            }
-
-            if (docs && docs.docs) {
-              docs = docs.docs;
-            }
-            docs.forEach(doc => doc._id.startsWith('target') && targets.push(doc));
-          });
-
-          return targets;
-        };
-
-        clock.setSystemTime(TEST_START);
-        const patientContact2 = Object.assign({}, patientContact, { _id: 'patient2', patient_id: 'patient_id2', });
-        const pregnancyRegistrationReport2 = Object.assign(
-          {},
-          pregnancyRegistrationReport,
-          {
-            _id: 'pregReg2',
-            fields: { lmp_date_8601: TEST_START, patient_id: patientContact2.patient_id },
-            reported_date: TEST_START+1
-          },
-        );
-        await db.bulkDocs([patientContact, patientContact2, pregnancyRegistrationReport, pregnancyRegistrationReport2]);
-        await rulesEngine.updateEmissionsFor(['patient']);
-        // we're in THE_FUTURE and our state is fresh
-
-        sinon.spy(db, 'bulkDocs');
-        sinon.spy(db, 'query');
-        const targets = await fetchTargets();
-        expect(db.query.callCount).to.eq(expectedQueriesForAllFreshData.length);
-        expect(targets[['pregnancy-registrations-this-month']].value).to.deep.eq({
-          total: 2,
-          pass: 2,
-        });
-        expect(targetsSaved().length).to.equal(1);
-
-        const sameTargets = await fetchTargets();
-        expect(db.query.callCount).to.eq(expectedQueriesForAllFreshData.length);
-        expect(sameTargets).to.deep.eq(targets);
-        expect(targetsSaved().length).to.equal(1);
-
-        // fast forward one month
-        clock.tick(moment(TEST_START).add(1, 'month').diff(moment(TEST_START)) + 2);
-        const newTargets = await fetchTargets(calendarInterval.getCurrent());
-        expect(newTargets[['pregnancy-registrations-this-month']].value).to.deep.eq({
-          total: 0,
-          pass: 0,
-        });
-        const savedTargets = targetsSaved();
-        expect(savedTargets.length).to.equal(3);
-
-        const firstTargetInterval = calendarInterval.getInterval(1, TEST_START);
-        const secondTargetInterval = calendarInterval.getCurrent();
-        expect(savedTargets[0].reporting_period).to.equal(moment(firstTargetInterval.end).format('YYYY-MM'));
-        expect(savedTargets[1].reporting_period).to.equal(moment(firstTargetInterval.end).format('YYYY-MM'));
-        expect(savedTargets[2].reporting_period).to.equal(moment(secondTargetInterval.end).format('YYYY-MM'));
-      });
     });
   }
 
diff --git a/shared-libs/rules-engine/test/pouchdb-provider.spec.js b/shared-libs/rules-engine/test/pouchdb-provider.spec.js
index 3dbbd95d1b3..e5e0539a4a0 100644
--- a/shared-libs/rules-engine/test/pouchdb-provider.spec.js
+++ b/shared-libs/rules-engine/test/pouchdb-provider.spec.js
@@ -254,6 +254,29 @@ describe('pouchdb provider', () => {
       expect(secondTargetDoc._rev).not.to.equal(firstTargetDoc._rev);
     });
 
+    it('should throw pouchdb get errors', async () => {
+      const docTag = '2024-07';
+      const nextTargets = [{ id: 'target', score: 1 }];
+
+      sinon.stub(db, 'get').rejects(new Error('pouch crash'));
+
+      await expect(
+        pouchdbProvider(db).commitTargetDoc(nextTargets, docTag, { userContactDoc, userSettingsDoc })
+      ).to.eventually.be.rejectedWith('pouch crash');
+    });
+
+    it('should throw pouchdb put errors', async () => {
+      const docTag = '2024-07';
+      const nextTargets = [{ id: 'target', score: 1 }];
+
+      sinon.restore();
+      sinon.stub(db, 'put').rejects(new Error('pouch crash'));
+
+      await expect(
+        pouchdbProvider(db).commitTargetDoc(nextTargets, docTag, { userContactDoc, userSettingsDoc })
+      ).to.eventually.be.rejectedWith('pouch crash');
+    });
+
   });
 
   describe('contactsBySubjectId', () => {
diff --git a/shared-libs/rules-engine/test/provider-wireup.spec.js b/shared-libs/rules-engine/test/provider-wireup.spec.js
index 13fa39bf8a8..f0afc81dbba 100644
--- a/shared-libs/rules-engine/test/provider-wireup.spec.js
+++ b/shared-libs/rules-engine/test/provider-wireup.spec.js
@@ -747,7 +747,7 @@ describe('provider-wireup integration tests', () => {
         expect(provider.commitTargetDoc.callCount).to.equal(0);
       });
 
-      it('should update the targets doc when the state was calculated outside of the interval', async () => {
+      it('should not update the targets doc when the state was calculated outside of the interval', async () => {
         clock.setSystemTime(moment('2020-04-28').valueOf());
         const rules = simpleNoolsTemplate('');
         const settings = {
@@ -779,13 +779,7 @@ describe('provider-wireup integration tests', () => {
 
         clock.setSystemTime(moment('2020-05-02').valueOf()); // next interval
         await wireup.initialize(provider, settings, {});
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0]).to.deep.equal([
-          [{ id: 'uhc', value: { pass: 1, total: 2 } }],
-          '2020-04',
-          { userSettingsDoc: { _id: 'org.couchdb.user:username' }, userContactDoc: { _id: 'mock_user_id' }},
-          true,
-        ]);
+        expect(provider.commitTargetDoc.called).to.be.false;
       });
 
       it('should work when the settings have been changed', async () => {
@@ -824,13 +818,7 @@ describe('provider-wireup integration tests', () => {
 
         clock.setSystemTime(moment('2020-04-28').valueOf()); // next interval
         await wireup.initialize(provider, settings, {});
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0]).to.deep.equal([
-          [{ id: 'uhc', value: { pass: 2, total: 2 } }],
-          '2020-04',
-          { userSettingsDoc: { _id: 'org.couchdb.user:username' }, userContactDoc: { _id: 'mock_user_id' } },
-          true,
-        ]);
+        expect(provider.commitTargetDoc.called).to.be.false;
       });
 
       it('should work with old format of the rules state store', async () => {
@@ -869,13 +857,7 @@ describe('provider-wireup integration tests', () => {
 
         clock.setSystemTime(moment('2020-04-28').valueOf()); // next interval
         await wireup.initialize(provider, settings, {});
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0]).to.deep.equal([
-          [{ id: 'uhc', value: { pass: 2, total: 2 } }],
-          '2020-04',
-          { userSettingsDoc: { _id: 'org.couchdb.user:username' }, userContactDoc: { _id: 'mock_user_id' } },
-          true,
-        ]);
+        expect(provider.commitTargetDoc.called).to.be.false;
       });
 
       it('should use inclusive operator when comparing dates (left)', async () => {
@@ -909,13 +891,7 @@ describe('provider-wireup integration tests', () => {
 
         clock.setSystemTime(moment('2020-06-02').valueOf()); // next interval
         await wireup.initialize(provider, settings, {});
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0]).to.deep.equal([
-          [{ id: 'uhc', value: { pass: 2, total: 2 } }],
-          '2020-05',
-          { userSettingsDoc: { _id: 'org.couchdb.user:username' }, userContactDoc: { _id: 'mock_user_id' } },
-          true,
-        ]);
+        expect(provider.commitTargetDoc.called).to.be.false;
       });
 
       it('should use inclusive operator when comparing dates (right)', async () => {
@@ -950,13 +926,7 @@ describe('provider-wireup integration tests', () => {
 
         clock.setSystemTime(moment('2020-06-02').valueOf()); // next interval
         await wireup.initialize(provider, settings, {});
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0]).to.deep.equal([
-          [{ id: 'uhc', value: { pass: 2, total: 2 } }],
-          '2020-05',
-          { userSettingsDoc: { _id: 'org.couchdb.user:username' }, userContactDoc: { _id: 'mock_user_id' } },
-          true,
-        ]);
+        expect(provider.commitTargetDoc.called).to.be.false;
       });
     });
 
@@ -995,100 +965,6 @@ describe('provider-wireup integration tests', () => {
         expect(provider.commitTargetDoc.args[1][1]).to.equal('2020-04');
         expect(provider.commitTargetDoc.args[1][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
       });
-
-      it('should update targets when in new interval when refreshing tasks', async () => {
-        const rules = simpleNoolsTemplate('');
-        const settings = {
-          rules,
-          enableTargets: true,
-          targets: [{
-            id: 'uhc',
-          }],
-          monthStartDate: 1,
-        };
-
-        clock.setSystemTime(moment('2020-04-30 23:00:00').valueOf());
-        await wireup.initialize(provider, settings, {});
-
-        const emissions = [
-          mockTargetEmission('uhc', 'doc4', moment('2020-02-23').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc2', moment('2020-03-29').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc1', moment('2020-04-12').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc3', moment('2020-04-14').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc5', moment('2020-05-05').valueOf(), true), // passes outside interval
-        ];
-
-        const refreshRulesEmissions = sinon.stub().resolves({ targetEmissions: emissions });
-        const withMockRefresher = wireup.__with__({ refreshRulesEmissions });
-
-        expect(provider.commitTargetDoc.callCount).to.equal(0);
-        await withMockRefresher(() => wireup.fetchTasksFor(provider));
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0][1]).to.equal('2020-04');
-        expect(provider.commitTargetDoc.args[0][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
-
-        clock.tick(5 * 60 * 60 * 1000); // 6 hours, it's now 2020-05-01 04:00:00
-        await withMockRefresher(() => wireup.fetchTasksFor(provider));
-
-        expect(provider.commitTargetDoc.callCount).to.equal(3);
-        expect(provider.commitTargetDoc.args[1][1]).to.equal('2020-04');
-        expect(provider.commitTargetDoc.args[1][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
-        expect(provider.commitTargetDoc.args[2][1]).to.equal('2020-05');
-        expect(provider.commitTargetDoc.args[2][0]).to.deep.equal([{ id: 'uhc', value: { pass: 1, total: 1 }}]);
-      });
-
-      it('should update targets when in new interval when refreshing targets', async () => {
-        const rules = simpleNoolsTemplate('');
-        const settings = {
-          rules,
-          enableTargets: true,
-          targets: [{
-            id: 'uhc',
-          }],
-          monthStartDate: 1,
-        };
-
-        clock.setSystemTime(moment('2020-04-30 23:00:00').valueOf());
-        await wireup.initialize(provider, settings, {});
-
-        const emissionsBefore = [
-          mockTargetEmission('uhc', 'doc4', moment('2020-02-23').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc2', moment('2020-03-29').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc1', moment('2020-04-12').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc3', moment('2020-04-14').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc5', moment('2020-05-05').valueOf(), true), // passes outside interval
-        ];
-
-        // simulate that we have a target with date: now (doc3) and that gets counted in both targets
-        const emissionsAfter = [
-          mockTargetEmission('uhc', 'doc4', moment('2020-02-23').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc2', moment('2020-03-29').valueOf(), true), // passes outside interval
-          mockTargetEmission('uhc', 'doc1', moment('2020-04-12').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc3', moment('2020-05-05').valueOf(), true), // passes within interval
-          mockTargetEmission('uhc', 'doc5', moment('2020-05-05').valueOf(), true), // passes outside interval
-        ];
-
-        const refreshRulesEmissions = sinon.stub()
-          .onCall(0).resolves({ targetEmissions: emissionsBefore })
-          .onCall(1).resolves({ targetEmissions: emissionsAfter });
-
-        const withMockRefresher = wireup.__with__({ refreshRulesEmissions });
-        // make sure our state has been "calculated" at least once!
-        await withMockRefresher(() => wireup.fetchTasksFor(provider));
-
-        expect(provider.commitTargetDoc.callCount).to.equal(1);
-        expect(provider.commitTargetDoc.args[0][1]).to.equal('2020-04');
-        expect(provider.commitTargetDoc.args[0][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
-
-        clock.tick(5 * 60 * 60 * 1000); // 6 hours, it's now 2020-05-01 04:00:00
-        await withMockRefresher(() => wireup.fetchTargets(provider));
-
-        expect(provider.commitTargetDoc.callCount).to.equal(3);
-        expect(provider.commitTargetDoc.args[1][1]).to.equal('2020-04');
-        expect(provider.commitTargetDoc.args[1][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
-        expect(provider.commitTargetDoc.args[2][1]).to.equal('2020-05');
-        expect(provider.commitTargetDoc.args[2][0]).to.deep.equal([{ id: 'uhc', value: { pass: 2, total: 2 }}]);
-      });
     });
   });
 
diff --git a/tests/e2e/default/admin/admin-access.wdio-spec.js b/tests/e2e/default/admin/admin-access.wdio-spec.js
index 4791220fd01..0e5ec16fd14 100644
--- a/tests/e2e/default/admin/admin-access.wdio-spec.js
+++ b/tests/e2e/default/admin/admin-access.wdio-spec.js
@@ -10,8 +10,7 @@ describe('Acessing the admin app', () => {
   const parent = placeFactory.place().build({ _id: 'dist1', type: 'district_hospital' });
 
   afterEach(async () => {
-    await browser.reloadSession();
-    await browser.url('/');
+    await common.reloadSession();
   });
 
   it('should redirect to login when not logged in', async () => {
diff --git a/tests/e2e/default/contacts/contact-details.wdio-spec.js b/tests/e2e/default/contacts/contact-details.wdio-spec.js
index 3464f964e8e..606b343ed92 100644
--- a/tests/e2e/default/contacts/contact-details.wdio-spec.js
+++ b/tests/e2e/default/contacts/contact-details.wdio-spec.js
@@ -80,7 +80,6 @@ describe('Contact details page.', () => {
         { roles: settings.roles, permissions: settings.permissions },
         { revert: true, ignoreReload: true }
       );
-
     };
 
     before(async () => {
@@ -91,7 +90,6 @@ describe('Contact details page.', () => {
       await utils.createUsers([user]);
 
       await loginPage.login(user);
-      await commonElements.waitForPageLoaded();
     });
 
     after(async () => {
@@ -124,8 +122,7 @@ describe('Contact details page.', () => {
 
     it('should not show reports when permission is disabled', async () => {
       await updatePermissions(ROLE, [], ['can_view_reports']);
-      await commonElements.sync(true);
-      await browser.refresh();
+      await commonElements.sync({ expectReload: true, reload: true });
       await waitForContactLoaded(true);
 
       expect(await (await contactPage.reportsCardSelectors.rhsReportListElement()).isDisplayed()).to.equal(false);
@@ -135,8 +132,7 @@ describe('Contact details page.', () => {
 
     it('should not show tasks when permission is disabled', async () => {
       await updatePermissions(ROLE, ['can_view_reports'], ['can_view_tasks']);
-      await commonElements.sync(true);
-      await browser.refresh();
+      await commonElements.sync({ reload: true, expectReload: true });
       await waitForContactLoaded(false);
 
       expect(await (await contactPage.reportsCardSelectors.rhsReportListElement()).isDisplayed()).to.equal(true);
@@ -160,7 +156,7 @@ describe('Contact details page.', () => {
       const contactSummaryFile = path.join(__dirname, 'config/contact-summary-error-config.js');
 
       const { contactSummary } = await chtConfUtils.compileNoolsConfig({ contactSummary: contactSummaryFile });
-      await utils.updateSettings({ contact_summary: contactSummary }, true);
+      await utils.updateSettings({ contact_summary: contactSummary }, { ignoreReload: true });
 
       await utils.saveDocs([...places.values(), patient]);
     });
diff --git a/tests/e2e/default/contacts/edit.wdio-spec.js b/tests/e2e/default/contacts/edit.wdio-spec.js
index 2f7dd5972ad..c9c7ff74f06 100644
--- a/tests/e2e/default/contacts/edit.wdio-spec.js
+++ b/tests/e2e/default/contacts/edit.wdio-spec.js
@@ -1,3 +1,4 @@
+const cloneDeep = require('lodash/cloneDeep');
 const loginPage = require('@page-objects/default/login/login.wdio.page');
 const commonPage = require('@page-objects/default/common/common.wdio.page');
 const placeFactory = require('@factories/cht/contacts/place');
@@ -16,7 +17,7 @@ describe('Edit ', () => {
 
   const offlineUserContact = personFactory.build({ name: CONTACT_NAME, parent: healthCenter });
   const onlineUserContact = personFactory.build({ parent: healthCenter });
-  healthCenter.contact = offlineUserContact;
+  healthCenter.contact = cloneDeep(offlineUserContact);
 
   const offlineUser = userFactory.build({
     username: 'offline_user',
diff --git a/tests/e2e/default/contacts/muting-contact-using-form.wdio-spec.js b/tests/e2e/default/contacts/muting-contact-using-form.wdio-spec.js
index a9f14a036d0..3df5b333c81 100644
--- a/tests/e2e/default/contacts/muting-contact-using-form.wdio-spec.js
+++ b/tests/e2e/default/contacts/muting-contact-using-form.wdio-spec.js
@@ -68,7 +68,7 @@ describe('Mute/Unmute contacts using a specific form - ', () => {
 
   it('should show a popup when trying to submit a non-unmuting form against a muted contact', async () => {
     await utils.revertSettings(true);
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
     await commonPage.goToPeople(mutePerson._id);
 
     const modalDetails = await contactPage.openFormWithWarning('death_report');
diff --git a/tests/e2e/default/contacts/person-under-area.wdio-spec.js b/tests/e2e/default/contacts/person-under-area.wdio-spec.js
index f5989d11e63..d34fc0ae78c 100644
--- a/tests/e2e/default/contacts/person-under-area.wdio-spec.js
+++ b/tests/e2e/default/contacts/person-under-area.wdio-spec.js
@@ -37,9 +37,7 @@ describe('Create Person Under Area, ', () => {
     await usersAdminPage.inputAddUserFields(username, 'Jack', 'chw', healthCenter2.name, person2.name, password);
     await usersAdminPage.saveUser();
 
-    await browser.reloadSession();
-    await browser.url('/');
-
+    await commonPage.reloadSession();
     await loginPage.login({ username, password });
 
     await commonPage.goToPeople();
diff --git a/tests/e2e/default/db/initial-replication.wdio-spec.js b/tests/e2e/default/db/initial-replication.wdio-spec.js
index 92a907973d7..0b3e7f1d7e8 100644
--- a/tests/e2e/default/db/initial-replication.wdio-spec.js
+++ b/tests/e2e/default/db/initial-replication.wdio-spec.js
@@ -50,7 +50,7 @@ describe('initial-replication', () => {
     const localAllDocsPreSync = await chtDbUtils.getDocs();
     const docIdsPreSync = dataFactory.ids(localAllDocsPreSync);
 
-    await commonPage.sync(false, 7000);
+    await commonPage.sync();
 
     const localAllDocs = await chtDbUtils.getDocs();
     const localDocIds = dataFactory.ids(localAllDocs);
@@ -102,7 +102,7 @@ describe('initial-replication', () => {
   };
 
   before(async () => {
-    await utils.stopSentinel();
+    await utils.toggleSentinelTransitions();
 
     // we're creating ~2000 docs
     await utils.saveDocs([...userAllowedDocs.places, ...userDeniedDocs.places]);
@@ -115,15 +115,14 @@ describe('initial-replication', () => {
 
   after(async () => {
     await sentinelUtils.skipToSeq();
-    await utils.startSentinel();
+    await utils.toggleSentinelTransitions();
     await utils.deleteUsers([userAllowedDocs.user]);
     await utils.revertDb([/^form:/], true);
     await utils.revertSettings(true);
   });
 
   afterEach(async () => {
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
   });
 
   it('should log user in', async () => {
diff --git a/tests/e2e/default/db/ongoing-replication.wdio-spec.js b/tests/e2e/default/db/ongoing-replication.wdio-spec.js
index d8f4a4685b5..2d032d9807d 100644
--- a/tests/e2e/default/db/ongoing-replication.wdio-spec.js
+++ b/tests/e2e/default/db/ongoing-replication.wdio-spec.js
@@ -30,9 +30,9 @@ describe('ongoing replication', function() {
   });
 
   after(async () => {
-    await utils.stopSentinel();
+    await utils.toggleSentinelTransitions();
     await sentinelUtils.skipToSeq();
-    await utils.startSentinel();
+    await utils.toggleSentinelTransitions();
     await utils.deleteUsers([userAllowedDocs.user]);
     await utils.revertDb([/^form:/], true);
   });
@@ -42,7 +42,7 @@ describe('ongoing replication', function() {
     const isRevertingSettings = utils.revertSettings(true);
     if (isRevertingSettings) {
       await isRevertingSettings;
-      await commonPage.sync(true, 30000);
+      await commonPage.sync({ expectReload: true, timeout: 30000 });
     }
   });
 
@@ -72,7 +72,7 @@ describe('ongoing replication', function() {
     await saveData(additionalDenied);
 
     await browser.throttle('online');
-    await commonPage.sync(false, 30000);
+    await commonPage.sync({ expectReload: true, timeout: 30000 });
 
     const localDocsPostSync = await chtDbUtils.getDocs();
     const localDocIds = dataFactory.ids(localDocsPostSync);
@@ -132,7 +132,7 @@ describe('ongoing replication', function() {
     await utils.addTranslations('rnd', {});
     await waitForServiceWorker.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
     const [rnd] = await chtDbUtils.getDocs(['messages-rnd']);
     expect(rnd).to.include({
       type: 'translations',
@@ -144,7 +144,7 @@ describe('ongoing replication', function() {
     await utils.saveDoc(rnd);
     await waitForServiceWorker.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
     const [updatedRnd] = await chtDbUtils.getDocs(['messages-rnd']);
     expect(updatedRnd.updated).to.equal(rnd.updated);
   });
@@ -161,7 +161,7 @@ describe('ongoing replication', function() {
     await utils.deleteDocs(docIdsToDelete);
     await waitForServiceWorker.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
     const localDocsPostSync = await chtDbUtils.getDocs();
     const localDocIds = dataFactory.ids(localDocsPostSync);
 
@@ -171,7 +171,7 @@ describe('ongoing replication', function() {
   it('should download settings updates', async () => {
     await commonPage.sync();
     await utils.updateSettings({ test: true }, { ignoreReload: 'api' });
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
     const [settings] = await chtDbUtils.getDocs(['settings']);
     expect(settings.settings.test).to.equal(true);
   });
diff --git a/tests/e2e/default/enketo/extension-lib-form.wdio-spec.js b/tests/e2e/default/enketo/extension-lib-form.wdio-spec.js
index 9d40dbef943..edbe1541daa 100644
--- a/tests/e2e/default/enketo/extension-lib-form.wdio-spec.js
+++ b/tests/e2e/default/enketo/extension-lib-form.wdio-spec.js
@@ -13,8 +13,7 @@ describe('Extension lib xpath function', () => {
 
     const waitForServiceWorker = await utils.waitForApiLogs(utils.SW_SUCCESSFUL_REGEX);
     await waitForServiceWorker.promise;
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
   });
 
   it('calculate average', async () => {
diff --git a/tests/e2e/default/enketo/training-cards.wdio-spec.js b/tests/e2e/default/enketo/training-cards.wdio-spec.js
index b9bd689ba2f..1a5ff4d781c 100644
--- a/tests/e2e/default/enketo/training-cards.wdio-spec.js
+++ b/tests/e2e/default/enketo/training-cards.wdio-spec.js
@@ -4,7 +4,6 @@ const commonPage = require('@page-objects/default/common/common.wdio.page');
 const trainingCardsPage = require('@page-objects/default/enketo/training-cards.wdio.page');
 const placeFactory = require('@factories/cht/contacts/place');
 const userFactory = require('@factories/cht/users/users');
-const personFactory = require('@factories/cht/contacts/person');
 const reportsPage = require('@page-objects/default/reports/reports.wdio.page');
 const privacyPolicyFactory = require('@factories/cht/settings/privacy-policy');
 const privacyPage = require('@page-objects/default/privacy-policy/privacy-policy.wdio.page');
@@ -26,7 +25,6 @@ describe('Training Cards', () => {
   before(async () => {
     const parent = placeFactory.place().build({ _id: 'dist1', type: 'district_hospital' });
     const user = userFactory.build({ roles: [ 'nurse', 'chw' ] });
-    const patient = personFactory.build({ parent: { _id: user.place._id, parent: { _id: parent._id } } });
     const formDoc = commonPage.createFormDoc(`${__dirname}/forms/training-cards-text-only`);
     formDoc._id = `form:${formDocId}`;
     formDoc.internalId = formDocId;
@@ -36,8 +34,7 @@ describe('Training Cards', () => {
       duration: 5,
     };
 
-    await utils.saveDocs([ parent, patient ]);
-    await utils.saveDoc(formDoc);
+    await utils.saveDocs([ parent, formDoc ]);
     await utils.createUsers([ user ]);
     await loginPage.login(user);
     await commonPage.waitForPageLoaded();
diff --git a/tests/e2e/default/enketo/undo-death-report.wdio-spec.js b/tests/e2e/default/enketo/undo-death-report.wdio-spec.js
index 05b81c928d1..eb80ba3dca4 100644
--- a/tests/e2e/default/enketo/undo-death-report.wdio-spec.js
+++ b/tests/e2e/default/enketo/undo-death-report.wdio-spec.js
@@ -26,7 +26,7 @@ describe('Submit an undo death report', () => {
     await commonPage.goToPeople(person._id);
     await commonPage.openFastActionReport('death_report');
     await deathReportForm.submitDeathReport();
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
   });
 
   it('should submit an undo death report, ' +
@@ -43,7 +43,7 @@ describe('Submit an undo death report', () => {
     );
     await genericForm.submitForm();
     await commonPage.waitForPageLoaded();
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true });
 
     expect(await (await contactPage.deathCardSelectors.deathCard()).isDisplayed()).to.be.false;
 
diff --git a/tests/e2e/default/logging/logging.wdio-spec.js b/tests/e2e/default/logging/logging.wdio-spec.js
index b5a309c62c5..4288d53ae9a 100644
--- a/tests/e2e/default/logging/logging.wdio-spec.js
+++ b/tests/e2e/default/logging/logging.wdio-spec.js
@@ -41,7 +41,6 @@ describe('audit log', () => {
       continuous: false
     };
     const requestOptions = {
-      resolveWithFullResponse: true,
       path: '/_replicator',
       method: 'POST',
       body
diff --git a/tests/e2e/default/login/login-logout.wdio-spec.js b/tests/e2e/default/login/login-logout.wdio-spec.js
index 8e8d81f1205..e8fdbe0bfdc 100644
--- a/tests/e2e/default/login/login-logout.wdio-spec.js
+++ b/tests/e2e/default/login/login-logout.wdio-spec.js
@@ -11,8 +11,7 @@ describe('Login page funcionality tests', () => {
   };
 
   afterEach(async () => {
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
   });
 
   describe('Locale', () => {
diff --git a/tests/e2e/default/more-options-menu/offline-user/all-permissions.wdio-spec.js b/tests/e2e/default/more-options-menu/offline-user/all-permissions.wdio-spec.js
index cf843f1306c..25bf2e5f784 100644
--- a/tests/e2e/default/more-options-menu/offline-user/all-permissions.wdio-spec.js
+++ b/tests/e2e/default/more-options-menu/offline-user/all-permissions.wdio-spec.js
@@ -128,7 +128,7 @@ describe('More Options Menu - Offline User', () => {
         'can_export_contacts', 'can_export_messages',
         'can_delete_reports', 'can_update_reports'];
       await utils.updatePermissions(offlineUser.roles, [], allPermissions, true);
-      await commonPage.sync(true);
+      await commonPage.sync({ expectReload: true });
     });
 
     after(async () => await utils.revertSettings(true));
diff --git a/tests/e2e/default/more-options-menu/offline-user/edit-permission-disabled.wdio-spec.js b/tests/e2e/default/more-options-menu/offline-user/edit-permission-disabled.wdio-spec.js
index 5ce3ef9bdb8..cd31024fa98 100644
--- a/tests/e2e/default/more-options-menu/offline-user/edit-permission-disabled.wdio-spec.js
+++ b/tests/e2e/default/more-options-menu/offline-user/edit-permission-disabled.wdio-spec.js
@@ -51,9 +51,8 @@ describe('More Options Menu - Offline User - Edit permissions disabled', () => {
     result = await utils.saveDoc(smsReport);
     smsReportId = result.id;
     await utils.createUsers([offlineUser]);
+    await utils.updatePermissions(offlineUser.roles, [], ['can_edit'], true);
     await loginPage.login(offlineUser);
-    await utils.updatePermissions(offlineUser.roles, [], ['can_edit']);
-    await commonPage.closeReloadModal();
   });
 
   after(async () => await utils.revertSettings(true));
diff --git a/tests/e2e/default/privacy-policy/privacy-policy.wdio-spec.js b/tests/e2e/default/privacy-policy/privacy-policy.wdio-spec.js
index 26e92a11515..d657552dffa 100644
--- a/tests/e2e/default/privacy-policy/privacy-policy.wdio-spec.js
+++ b/tests/e2e/default/privacy-policy/privacy-policy.wdio-spec.js
@@ -22,8 +22,7 @@ describe('Privacy policy', () => {
   users.forEach((user) => {
     describe(`for an ${user.isOffline ? 'offline':'online'} user`, () => {
       before(async () => {
-        await browser.reloadSession();
-        await browser.url('/');
+        await commonPage.reloadSession();
         await utils.saveDocs([parent, privacyPolicy]);
         await utils.createUsers([user]);
         await loginPage.login({ username: user.username, password: user.password, privacyPolicy: true });
@@ -51,16 +50,14 @@ describe('Privacy policy', () => {
       });
 
       it('should not show on subsequent login', async () => {
-        await browser.reloadSession();
-        await browser.url('/');
+        await commonPage.reloadSession();
         await loginPage.login({ username: user.username, password: user.password });
         await (await commonPage.tabsSelector.messagesTab()).waitForDisplayed();
         expect(await (await privacyPage.privacyWrapper()).isDisplayed()).to.not.be.true;
       });
 
       it('should show french policy on secondary login', async () => {
-        await browser.reloadSession();
-        await browser.url('/');
+        await commonPage.reloadSession();
         await loginPage.login({ username: user.username, password: user.password, locale: 'fr', privacyPolicy: true });
         await privacyPage.waitAndAcceptPolicy(await privacyPage.privacyWrapper(), frenchTexts);
         expect(await (await commonPage.tabsSelector.messagesTab()).isDisplayed()).to.be.true;
@@ -116,8 +113,7 @@ describe('Privacy policy', () => {
     before(async () => {
       await utils.saveDocs([parent, privacyPolicy]);
       await utils.createUsers([conflictUser]);
-      await browser.reloadSession();
-      await browser.url('/');
+      await commonPage.reloadSession();
       await loginPage.login({ username: conflictUser.username, password: conflictUser.password, privacyPolicy: true });
     });
 
diff --git a/tests/e2e/default/purge/purge.wdio-spec.js b/tests/e2e/default/purge/purge.wdio-spec.js
index fdbde3c4771..b16f0bea3c6 100644
--- a/tests/e2e/default/purge/purge.wdio-spec.js
+++ b/tests/e2e/default/purge/purge.wdio-spec.js
@@ -42,8 +42,6 @@ describe('purge', function() {
 
   const pregnancies = generateReports(125, 'pregnancy');
 
-  const restartSentinel = () => utils.stopSentinel().then(() => utils.startSentinel());
-
   const getAllReports = () => browser.executeAsync(callback => {
     window.CHTCore.DB
       .get()
@@ -68,7 +66,7 @@ describe('purge', function() {
 
   const runPurging = async () => {
     const seq = await sentinelUtils.getCurrentSeq();
-    await restartSentinel();
+    await utils.runSentinelTasks();
     await sentinelUtils.waitForPurgeCompletion(seq);
     await utils.delayPromise(1000);  // API has to pick up on purging completing
   };
@@ -79,8 +77,7 @@ describe('purge', function() {
     await utils.deleteUsers([user]);
     await utils.revertDb([/^form:/], true);
 
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonElements.reloadSession();
   });
 
   it('purging runs on sync', async () => {
@@ -104,7 +101,7 @@ describe('purge', function() {
     await updatePurgeSettings(filterHomeVisitReports, true);
     await runPurging();
 
-    await commonElements.sync(true);
+    await commonElements.sync({ expectReload: true });
 
     allReports = await getAllReports();
     // this only works because the client didn't have to "purge" these docs and the revs didn't have
diff --git a/tests/e2e/default/pwa/manifest.wdio-spec.js b/tests/e2e/default/pwa/manifest.wdio-spec.js
index fc88697b135..a6b1b8d137e 100644
--- a/tests/e2e/default/pwa/manifest.wdio-spec.js
+++ b/tests/e2e/default/pwa/manifest.wdio-spec.js
@@ -31,7 +31,7 @@ describe('manifest.json', () => {
       try {
         await utils.deleteDoc('branding');
       } catch (err) {
-        if (err.statusCode === 404) {
+        if (err.status === 404) {
           return; // already not there - success!
         }
         throw err;
@@ -53,7 +53,7 @@ describe('manifest.json', () => {
     try {
       return await utils.getDoc('branding');
     } catch (e) {
-      if (e.statusCode === 404) {
+      if (e.status === 404) {
         return { _id: 'branding' };
       }
       throw e;
diff --git a/tests/e2e/default/service-worker/service-worker.wdio-spec.js b/tests/e2e/default/service-worker/service-worker.wdio-spec.js
index 3fe432351a0..e3d4e41aa53 100644
--- a/tests/e2e/default/service-worker/service-worker.wdio-spec.js
+++ b/tests/e2e/default/service-worker/service-worker.wdio-spec.js
@@ -67,7 +67,6 @@ describe('Service worker cache', () => {
   const chw = userFactory.build({ place: district._id });
 
   const login = async () => {
-    await browser.throttle('online');
     await loginPage.login(chw);
     await commonPage.waitForPageLoaded();
   };
@@ -78,6 +77,7 @@ describe('Service worker cache', () => {
   };
 
   const loginIfNeeded = async () => {
+    await browser.throttle('online');
     if (!await isLoggedIn()) {
       await login();
     }
@@ -93,6 +93,10 @@ describe('Service worker cache', () => {
     await loginIfNeeded();
   });
 
+  afterEach(async () => {
+    await utils.revertSettings(true);
+  });
+
   after(async () => {
     await utils.deleteUsers([chw]);
     await utils.revertDb([/^form:/], true);
@@ -120,6 +124,7 @@ describe('Service worker cache', () => {
       '/img/icon-pregnant-selected.svg',
       '/img/icon-pregnant.svg',
       '/img/icon-filter.svg',
+      '/img/icon-check.svg',
       '/img/icon.png',
       '/img/icon-back.svg',
       '/img/layers.png',
@@ -146,7 +151,7 @@ describe('Service worker cache', () => {
     await utils.saveDoc(branding);
     await waitForLogs.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
     await browser.throttle('offline'); // make sure we load the login page from cache
     await commonPage.logout();
     expect(await browser.getTitle()).to.equal('Not Medic');
@@ -160,7 +165,7 @@ describe('Service worker cache', () => {
     });
     await waitForLogs.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
     await browser.throttle('offline'); // make sure we load the login page from cache
     await commonPage.logout();
 
@@ -171,7 +176,7 @@ describe('Service worker cache', () => {
   it('adding new languages triggers login page refresh', async () => {
     const languageCode = 'ro';
     await utils.enableLanguage(languageCode);
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
 
     const waitForLogs = await utils.waitForApiLogs(utils.SW_SUCCESSFUL_REGEX);
     await utils.addTranslations(languageCode, {
@@ -182,7 +187,7 @@ describe('Service worker cache', () => {
     });
     await waitForLogs.promise;
 
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
     await commonPage.logout();
 
     await loginPage.changeLanguage(languageCode, 'Utilizator');
@@ -190,12 +195,10 @@ describe('Service worker cache', () => {
     expect(await (await loginPage.labelForUser()).getText()).to.equal('Utilizator');
     expect(await (await loginPage.loginButton()).getText()).to.equal('Autentificare');
     expect(await (await loginPage.labelForPassword()).getText()).to.equal('Parola');
-
-    await utils.revertSettings(true);
   });
 
   it('other translation updates do not trigger a login page refresh', async () => {
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
 
     const cacheDetails = await getCachedRequests(true);
 
@@ -206,7 +209,7 @@ describe('Service worker cache', () => {
       'some': 'thing',
     });
     await waitForLogs.promise;
-    await commonPage.sync(true);
+    await commonPage.sync({ expectReload: true, serviceWorkerUpdate: true });
 
     const updatedCacheDetails = await getCachedRequests(true);
 
diff --git a/tests/e2e/default/sms/rapidpro.wdio-spec.js b/tests/e2e/default/sms/rapidpro.wdio-spec.js
index fd5816a026c..9d3c378a324 100644
--- a/tests/e2e/default/sms/rapidpro.wdio-spec.js
+++ b/tests/e2e/default/sms/rapidpro.wdio-spec.js
@@ -75,7 +75,7 @@ describe('RapidPro SMS Gateway', () => {
         });
         throw new Error('should have thrown');
       } catch (err) {
-        expect(err.responseBody).to.eql({ code: 403, error: 'No incoming key configured' });
+        expect(err.body).to.eql({ code: 403, error: 'No incoming key configured' });
       }
     });
 
@@ -91,7 +91,7 @@ describe('RapidPro SMS Gateway', () => {
         });
         throw new Error('should have thrown');
       } catch (err) {
-        expect(err.responseBody).to.eql({ code: 403, error: 'Missing authorization token' });
+        expect(err.body).to.eql({ code: 403, error: 'Missing authorization token' });
       }
     });
 
@@ -108,7 +108,7 @@ describe('RapidPro SMS Gateway', () => {
         });
         throw new Error('should have thrown');
       } catch (err) {
-        expect(err.responseBody).to.eql({ code: 403, error: 'Incorrect token' });
+        expect(err.body).to.eql({ code: 403, error: 'Incorrect token' });
       }
     });
 
@@ -125,7 +125,7 @@ describe('RapidPro SMS Gateway', () => {
         });
         throw new Error('should have thrown');
       } catch (err) {
-        expect(err.responseBody).to.eql({ code: 403, error: 'Missing authorization token' });
+        expect(err.body).to.eql({ code: 403, error: 'Missing authorization token' });
       }
     });
 
@@ -143,7 +143,7 @@ describe('RapidPro SMS Gateway', () => {
         });
         throw new Error('should have thrown');
       } catch (err) {
-        expect(err.responseBody).to.eql({ code: 400, error: 'Message was not saved' });
+        expect(err.body).to.eql({ code: 400, error: 'Message was not saved' });
       }
     });
 
diff --git a/tests/e2e/default/suites.js b/tests/e2e/default/suites.js
index 7514c73f9b1..d0254acd85b 100644
--- a/tests/e2e/default/suites.js
+++ b/tests/e2e/default/suites.js
@@ -6,6 +6,7 @@ const SUITES = {
     './more-options-menu/**/*.wdio-spec.js',
     './users/**/*.wdio-spec.js',
     './about/**/*.wdio-spec.js',
+    './training-materials/**/*.wdio-spec.js',
     './navigation/**/*.wdio-spec.js',
     './old-navigation/**/*.wdio-spec.js',
     './privacy-policy/**/*.wdio-spec.js',
diff --git a/tests/e2e/default/targets/target-accuracy.wdio-spec.js b/tests/e2e/default/targets/target-accuracy.wdio-spec.js
index 171c10b7c86..f647a997fc3 100644
--- a/tests/e2e/default/targets/target-accuracy.wdio-spec.js
+++ b/tests/e2e/default/targets/target-accuracy.wdio-spec.js
@@ -66,7 +66,7 @@ describe('Target accuracy', () => {
     await commonPage.goToPeople(chwContact._id);
     await browser.takeScreenshot();
 
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
     const serverDoc = await utils.getDoc(targetDocId);
 
     expect(serverDoc._rev).to.match(/^1-/);
@@ -84,7 +84,7 @@ describe('Target accuracy', () => {
     await contactsPage.addPerson({ name: 'Jody' }, false);
     await commonPage.waitForPageLoaded();
 
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
     const serverDoc = await utils.getDoc(targetDocId);
 
     expect(serverDoc._rev).to.match(/^2-/);
@@ -102,7 +102,7 @@ describe('Target accuracy', () => {
     await contactsPage.editPersonName('Jody', 'Jody Ash');
     await commonPage.waitForPageLoaded();
 
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
     const serverDoc = await utils.getDoc(targetDocId);
     expect(serverDoc._rev).to.match(/^2-/);
   });
@@ -121,7 +121,7 @@ describe('Target accuracy', () => {
     await contactsPage.selectLHSRowByText('Jody Ash');
     await commonPage.waitForPageLoaded();
 
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
     const serverDoc = await utils.getDoc(targetDocId);
     expect(serverDoc._rev).to.match(/^2-/);
   });
@@ -134,7 +134,7 @@ describe('Target accuracy', () => {
     await commonPage.waitForPageLoaded();
 
     await browser.pause(1500); // wait for debounced calculation
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
 
     const serverDoc = await utils.getDoc(targetDocId);
     expect(serverDoc._rev).to.match(/^3-/);
@@ -153,7 +153,7 @@ describe('Target accuracy', () => {
     const contacts = Array.from({ length: 20 }).map(() => personFactory.build(parent));
     await utils.saveDocs(contacts);
 
-    await commonPage.sync(false, 2000);
+    await commonPage.sync();
     await browser.pause(1500); // wait for debounced calculation
 
     const serverDoc = await utils.getDoc(targetDocId);
diff --git a/tests/e2e/default/targets/target-aggregates.wdio-spec.js b/tests/e2e/default/targets/target-aggregates.wdio-spec.js
index 159f1aea028..54e0ba9c9be 100644
--- a/tests/e2e/default/targets/target-aggregates.wdio-spec.js
+++ b/tests/e2e/default/targets/target-aggregates.wdio-spec.js
@@ -374,8 +374,7 @@ describe('Target aggregates', () => {
           targetAggregatesConfig.TARGETS_DEFAULT_CONFIG,
           userWithManyPlaces
         );
-        await commonPage.sync(true);
-        await browser.refresh();
+        await commonPage.sync({ reload: true, expectReload: true });
 
         await commonPage.goToAnalytics();
         await targetAggregatesPage.goToTargetAggregates(true);
diff --git a/tests/e2e/default/tasks/config/tasks-breadcrumbs-config.js b/tests/e2e/default/tasks/config/tasks-breadcrumbs-config.js
index 2c6687693e9..d6a4a79f934 100644
--- a/tests/e2e/default/tasks/config/tasks-breadcrumbs-config.js
+++ b/tests/e2e/default/tasks/config/tasks-breadcrumbs-config.js
@@ -38,7 +38,7 @@ module.exports = [
     ],
     events: [
       {
-        id: 'person-creation-follow-up',
+        id: 'person-creation',
         start: 3,
         end: 7,
         dueDate: function (event, contact) {
@@ -47,4 +47,35 @@ module.exports = [
       }
     ]
   },
+
+  {
+    name: 'person_create_follow_up',
+    icon: 'icon-person',
+    title: 'person_create_follow_up',
+    appliesTo: 'reports',
+    appliesToType: ['home_visit'],
+    appliesIf: function () {
+      return true;
+    },
+    resolvedIf: function (contact) {
+      return isFormArraySubmittedInWindow(contact.reports, ['home_visit'], contact.contact.reported_date);
+    },
+    actions: [
+      {
+        type: 'report',
+        form: 'home_visit'
+      }
+    ],
+    events: [
+      {
+        id: 'person-creation-follow-up',
+        start: 3,
+        end: 1,
+        dueDate: function (event, contact) {
+          return contact.contact.reported_date;
+        }
+      }
+    ]
+  },
+  
 ];
diff --git a/tests/e2e/default/tasks/tasks.wdio-spec.js b/tests/e2e/default/tasks/tasks.wdio-spec.js
index e2a1ed6ba26..03a972a974e 100644
--- a/tests/e2e/default/tasks/tasks.wdio-spec.js
+++ b/tests/e2e/default/tasks/tasks.wdio-spec.js
@@ -69,13 +69,6 @@ describe('Tasks', () => {
     await utils.revertSettings(true);
   });
 
-  after(async () => {
-    await utils.deleteUsers([chw]);
-    await utils.revertDb([/^form:/], true);
-    await browser.deleteCookies();
-    await browser.refresh();
-  });
-
   it('should remove task from list when CHW completes a task successfully', async () => {
     await tasksPage.compileTasks('tasks-breadcrumbs-config.js', true);
     
@@ -92,6 +85,24 @@ describe('Tasks', () => {
     expect(list).to.have.length(2);
   });
 
+  it('should add a task when CHW completes a task successfully, and that task creates another task', async () => {
+    await tasksPage.compileTasks('tasks-breadcrumbs-config.js', false);
+    
+    await commonPage.goToTasks();
+    let list = await tasksPage.getTasks();
+    expect(list).to.have.length(2);
+    let task = await tasksPage.getTaskByContactAndForm('Megan Spice', 'person_create');
+    await task.click();
+    await tasksPage.waitForTaskContentLoaded('Home Visit');
+    const taskElement = await tasksPage.getOpenTaskElement();
+    await genericForm.submitForm();
+    await taskElement.waitForDisplayed();
+    await commonPage.sync({ expectReload: true });
+    task = await tasksPage.getTaskByContactAndForm('Megan Spice', 'person_create_follow_up');
+    list = await tasksPage.getTasks();
+    expect(list).to.have.length(3);
+  });
+
   it('should load multiple pages of tasks on infinite scrolling', async () => {
     await tasksPage.compileTasks('tasks-multiple-config.js', true);
 
diff --git a/tests/e2e/default/training-materials/forms/expired-training.xml b/tests/e2e/default/training-materials/forms/expired-training.xml
new file mode 100644
index 00000000000..9461ad67964
--- /dev/null
+++ b/tests/e2e/default/training-materials/forms/expired-training.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+    <h:head>
+        <h:title>First Training</h:title>
+        <model>
+            <itext>
+                <translation lang="en">
+                    <text id="/expired_training/action_icons/action_icons_aligment/action_icons_image_1:label">
+                        <value>**Old feature**</value>
+                    </text>
+                    <text id="/expired_training/action_icons/action_icons_aligment/action_icons_image_2:label">
+                        <value>**New feature**</value>
+                    </text>
+                    <text id="/expired_training/action_icons/action_icons_note_1:label">
+                        <value>The "New Action" icon at the bottom of your app has also changed.</value>
+                    </text>
+                    <text id="/expired_training/ending/ending_note_1:label">
+                        <value>If you do not understand these changes, please contact your supervisor.</value>
+                    </text>
+                    <text id="/expired_training/ending/ending_note_2:label">
+                        <value>When you're ready, go ahead and start using your app.</value>
+                    </text>
+                    <text id="/expired_training/intro/intro_note_1:label">
+                        <value>There have been some changes to icons in your app. The next few screens will show you the difference.</value>
+                    </text>
+                    <text id="/expired_training/intro/intro_note_2:label">
+                        <value>Read each screen carefully and tap "Next" if you understand. If you need extra support, please contact your supervisor.</value>
+                    </text>
+                </translation>
+            </itext>
+            <instance>
+                <expired_training id="expired_training" prefix="J1!expired_training!" delimiter="#" version="2022-06-07 10:17:10">
+                    <intro tag="hidden">
+                        <intro_note_1 tag="hidden"/>
+                        <intro_note_2 tag="hidden"/>
+                    </intro>
+                    <action_icons tag="hidden">
+                        <action_icons_note_1 tag="hidden"/>
+                        <action_icons_aligment>
+                            <action_icons_image_1 tag="hidden"/>
+                            <action_icons_image_2 tag="hidden"/>
+                        </action_icons_aligment>
+                    </action_icons>
+                    <ending tag="hidden">
+                        <ending_note_1 tag="hidden"/>
+                        <ending_note_2 tag="hidden"/>
+                    </ending>
+                    <meta tag="hidden">
+                        <instanceID/>
+                    </meta>
+                </expired_training>
+            </instance>
+            <instance id="contact-summary"/>
+            <bind nodeset="/expired_training/intro/intro_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/intro/intro_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/action_icons/action_icons_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/action_icons/action_icons_aligment/action_icons_image_1" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/action_icons/action_icons_aligment/action_icons_image_2" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/ending/ending_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/ending/ending_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/expired_training/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+        </model>
+    </h:head>
+    <h:body class="pages">
+        <group appearance="field-list" ref="/expired_training/intro">
+            <input ref="/expired_training/intro/intro_note_1">
+                <label ref="jr:itext('/expired_training/intro/intro_note_1:label')"/>
+            </input>
+            <input ref="/expired_training/intro/intro_note_2">
+                <label ref="jr:itext('/expired_training/intro/intro_note_2:label')"/>
+            </input>
+        </group>
+        <group appearance="field-list" ref="/expired_training/action_icons">
+            <input ref="/expired_training/action_icons/action_icons_note_1">
+                <label ref="jr:itext('/expired_training/action_icons/action_icons_note_1:label')"/>
+            </input>
+            <group ref="/expired_training/action_icons/action_icons_aligment">
+                <input ref="/expired_training/action_icons/action_icons_aligment/action_icons_image_1">
+                    <label ref="jr:itext('/expired_training/action_icons/action_icons_aligment/action_icons_image_1:label')"/>
+                </input>
+                <input ref="/expired_training/action_icons/action_icons_aligment/action_icons_image_2">
+                    <label ref="jr:itext('/expired_training/action_icons/action_icons_aligment/action_icons_image_2:label')"/>
+                </input>
+            </group>
+        </group>
+        <group appearance="field-list" ref="/expired_training/ending">
+            <input ref="/expired_training/ending/ending_note_1">
+                <label ref="jr:itext('/expired_training/ending/ending_note_1:label')"/>
+            </input>
+            <input ref="/expired_training/ending/ending_note_2">
+                <label ref="jr:itext('/expired_training/ending/ending_note_2:label')"/>
+            </input>
+        </group>
+    </h:body>
+</h:html>
diff --git a/tests/e2e/default/training-materials/forms/first-training.xml b/tests/e2e/default/training-materials/forms/first-training.xml
new file mode 100644
index 00000000000..3f50b1d7c07
--- /dev/null
+++ b/tests/e2e/default/training-materials/forms/first-training.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+    <h:head>
+        <h:title>First Training</h:title>
+        <model>
+            <itext>
+                <translation lang="en">
+                    <text id="/first_training/action_icons/action_icons_aligment/action_icons_image_1:label">
+                        <value>**Old feature**</value>
+                    </text>
+                    <text id="/first_training/action_icons/action_icons_aligment/action_icons_image_2:label">
+                        <value>**New feature**</value>
+                    </text>
+                    <text id="/first_training/action_icons/action_icons_note_1:label">
+                        <value>The "New Action" icon at the bottom of your app has also changed.</value>
+                    </text>
+                    <text id="/first_training/ending/ending_note_1:label">
+                        <value>If you do not understand these changes, please contact your supervisor.</value>
+                    </text>
+                    <text id="/first_training/ending/ending_note_2:label">
+                        <value>When you're ready, go ahead and start using your app.</value>
+                    </text>
+                    <text id="/first_training/intro/intro_note_1:label">
+                        <value>There have been some changes to icons in your app. The next few screens will show you the difference.</value>
+                    </text>
+                    <text id="/first_training/intro/intro_note_2:label">
+                        <value>Read each screen carefully and tap "Next" if you understand. If you need extra support, please contact your supervisor.</value>
+                    </text>
+                </translation>
+            </itext>
+            <instance>
+                <first_training id="first_training" prefix="J1!first_training!" delimiter="#" version="2022-06-07 10:17:10">
+                    <intro tag="hidden">
+                        <intro_note_1 tag="hidden"/>
+                        <intro_note_2 tag="hidden"/>
+                    </intro>
+                    <action_icons tag="hidden">
+                        <action_icons_note_1 tag="hidden"/>
+                        <action_icons_aligment>
+                            <action_icons_image_1 tag="hidden"/>
+                            <action_icons_image_2 tag="hidden"/>
+                        </action_icons_aligment>
+                    </action_icons>
+                    <ending tag="hidden">
+                        <ending_note_1 tag="hidden"/>
+                        <ending_note_2 tag="hidden"/>
+                    </ending>
+                    <meta tag="hidden">
+                        <instanceID/>
+                    </meta>
+                </first_training>
+            </instance>
+            <instance id="contact-summary"/>
+            <bind nodeset="/first_training/intro/intro_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/intro/intro_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/action_icons/action_icons_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/action_icons/action_icons_aligment/action_icons_image_1" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/action_icons/action_icons_aligment/action_icons_image_2" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/ending/ending_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/ending/ending_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/first_training/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+        </model>
+    </h:head>
+    <h:body class="pages">
+        <group appearance="field-list" ref="/first_training/intro">
+            <input ref="/first_training/intro/intro_note_1">
+                <label ref="jr:itext('/first_training/intro/intro_note_1:label')"/>
+            </input>
+            <input ref="/first_training/intro/intro_note_2">
+                <label ref="jr:itext('/first_training/intro/intro_note_2:label')"/>
+            </input>
+        </group>
+        <group appearance="field-list" ref="/first_training/action_icons">
+            <input ref="/first_training/action_icons/action_icons_note_1">
+                <label ref="jr:itext('/first_training/action_icons/action_icons_note_1:label')"/>
+            </input>
+            <group ref="/first_training/action_icons/action_icons_aligment">
+                <input ref="/first_training/action_icons/action_icons_aligment/action_icons_image_1">
+                    <label ref="jr:itext('/first_training/action_icons/action_icons_aligment/action_icons_image_1:label')"/>
+                </input>
+                <input ref="/first_training/action_icons/action_icons_aligment/action_icons_image_2">
+                    <label ref="jr:itext('/first_training/action_icons/action_icons_aligment/action_icons_image_2:label')"/>
+                </input>
+            </group>
+        </group>
+        <group appearance="field-list" ref="/first_training/ending">
+            <input ref="/first_training/ending/ending_note_1">
+                <label ref="jr:itext('/first_training/ending/ending_note_1:label')"/>
+            </input>
+            <input ref="/first_training/ending/ending_note_2">
+                <label ref="jr:itext('/first_training/ending/ending_note_2:label')"/>
+            </input>
+        </group>
+    </h:body>
+</h:html>
diff --git a/tests/e2e/default/training-materials/forms/second-training.xml b/tests/e2e/default/training-materials/forms/second-training.xml
new file mode 100644
index 00000000000..9bebba6a873
--- /dev/null
+++ b/tests/e2e/default/training-materials/forms/second-training.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+    <h:head>
+        <h:title>Second Training</h:title>
+        <model>
+            <itext>
+                <translation lang="en">
+                    <text id="/second_training/action_icons/action_icons_aligment/action_icons_image_1:label">
+                        <value>**Old icon**</value>
+                    </text>
+                    <text id="/second_training/action_icons/action_icons_aligment/action_icons_image_2:label">
+                        <value>**New icon**</value>
+                    </text>
+                    <text id="/second_training/action_icons/action_icons_note_1:label">
+                        <value>The "New Action" icon at the bottom of your app has also changed.</value>
+                    </text>
+                    <text id="/second_training/ending/ending_note_1:label">
+                        <value>If you do not understand these changes, please contact your supervisor.</value>
+                    </text>
+                    <text id="/second_training/ending/ending_note_2:label">
+                        <value>When you're ready, go ahead and start using your app.</value>
+                    </text>
+                    <text id="/second_training/intro/intro_note_1:label">
+                        <value>The next few screens will show you the difference.</value>
+                    </text>
+                    <text id="/second_training/intro/intro_note_2:label">
+                        <value>Read each screen carefully and tap "Next" if you understand. If you need extra support, please contact your supervisor.</value>
+                    </text>
+                </translation>
+            </itext>
+            <instance>
+                <second_training id="second_training" prefix="J1!second_training!" delimiter="#" version="2022-06-07 10:17:10">
+                    <intro tag="hidden">
+                        <intro_note_1 tag="hidden"/>
+                        <intro_note_2 tag="hidden"/>
+                    </intro>
+                    <action_icons tag="hidden">
+                        <action_icons_note_1 tag="hidden"/>
+                        <action_icons_aligment>
+                            <action_icons_image_1 tag="hidden"/>
+                            <action_icons_image_2 tag="hidden"/>
+                        </action_icons_aligment>
+                    </action_icons>
+                    <ending tag="hidden">
+                        <ending_note_1 tag="hidden"/>
+                        <ending_note_2 tag="hidden"/>
+                    </ending>
+                    <meta tag="hidden">
+                        <instanceID/>
+                    </meta>
+                </second_training>
+            </instance>
+            <instance id="contact-summary"/>
+            <bind nodeset="/second_training/intro/intro_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/intro/intro_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/action_icons/action_icons_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/action_icons/action_icons_aligment/action_icons_image_1" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/action_icons/action_icons_aligment/action_icons_image_2" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/ending/ending_note_1" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/ending/ending_note_2" readonly="true()" type="string"/>
+            <bind nodeset="/second_training/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+        </model>
+    </h:head>
+    <h:body class="pages">
+        <group appearance="field-list" ref="/second_training/intro">
+            <input ref="/second_training/intro/intro_note_1">
+                <label ref="jr:itext('/second_training/intro/intro_note_1:label')"/>
+            </input>
+            <input ref="/second_training/intro/intro_note_2">
+                <label ref="jr:itext('/second_training/intro/intro_note_2:label')"/>
+            </input>
+        </group>
+        <group appearance="field-list" ref="/second_training/action_icons">
+            <input ref="/second_training/action_icons/action_icons_note_1">
+                <label ref="jr:itext('/second_training/action_icons/action_icons_note_1:label')"/>
+            </input>
+            <group ref="/second_training/action_icons/action_icons_aligment">
+                <input ref="/second_training/action_icons/action_icons_aligment/action_icons_image_1">
+                    <label ref="jr:itext('/second_training/action_icons/action_icons_aligment/action_icons_image_1:label')"/>
+                </input>
+                <input ref="/second_training/action_icons/action_icons_aligment/action_icons_image_2">
+                    <label ref="jr:itext('/second_training/action_icons/action_icons_aligment/action_icons_image_2:label')"/>
+                </input>
+            </group>
+        </group>
+        <group appearance="field-list" ref="/second_training/ending">
+            <input ref="/second_training/ending/ending_note_1">
+                <label ref="jr:itext('/second_training/ending/ending_note_1:label')"/>
+            </input>
+            <input ref="/second_training/ending/ending_note_2">
+                <label ref="jr:itext('/second_training/ending/ending_note_2:label')"/>
+            </input>
+        </group>
+    </h:body>
+</h:html>
diff --git a/tests/e2e/default/training-materials/training-materials.wdio-spec.js b/tests/e2e/default/training-materials/training-materials.wdio-spec.js
new file mode 100644
index 00000000000..49231a0a983
--- /dev/null
+++ b/tests/e2e/default/training-materials/training-materials.wdio-spec.js
@@ -0,0 +1,164 @@
+const fs = require('fs');
+const utils = require('@utils');
+const loginPage = require('@page-objects/default/login/login.wdio.page');
+const commonPage = require('@page-objects/default/common/common.wdio.page');
+const trainingCardsPage = require('@page-objects/default/enketo/training-cards.wdio.page');
+const placeFactory = require('@factories/cht/contacts/place');
+const userFactory = require('@factories/cht/users/users');
+const reportsPage = require('@page-objects/default/reports/reports.wdio.page');
+
+describe('Training Materials Page', () => {
+  const CONFIRM_TITLE = 'Leave training?';
+  const CONFIRM_CONTENT = 'This training is not finished. ' +
+    'If you leave now, you will lose your progress and be prompted again later to complete it.';
+  const FORMS_FOLDER = `${__dirname}/../../../e2e/default/training-materials/forms`;
+  const FIRST_TRAINING_NAME = 'first_training';
+  const FIRST_TRAINING_ID = `training:${FIRST_TRAINING_NAME}`;
+  const SECOND_TRAINING_NAME = 'second_training';
+  const SECOND_TRAINING_ID = `training:${SECOND_TRAINING_NAME}`;
+
+  before(async () => {
+    const facility = placeFactory.place().build({ _id: 'dist1', type: 'district_hospital' });
+    const user = userFactory.build({ roles: [ 'pharmacist', 'chw' ] });
+
+    const firstXML = fs.readFileSync(`${FORMS_FOLDER}/first-training.xml`, 'utf8');
+    const firstTraining = {
+      _id: `form:${FIRST_TRAINING_ID}`,
+      internalId: FIRST_TRAINING_ID,
+      title: FIRST_TRAINING_NAME,
+      type: 'form',
+      context: { start_date: new Date().getTime(), user_roles: [ 'pharmacist' ], duration: 5 },
+      _attachments: {
+        xml: { content_type: 'application/octet-stream', data: Buffer.from(firstXML).toString('base64') },
+      },
+    };
+
+    const secondXML = fs.readFileSync(`${FORMS_FOLDER}/second-training.xml`, 'utf8');
+    const secondTraining = {
+      _id: `form:${SECOND_TRAINING_ID}`,
+      internalId: SECOND_TRAINING_ID,
+      title: SECOND_TRAINING_NAME,
+      type: 'form',
+      context: { start_date: new Date().getTime(), user_roles: [ 'pharmacist' ], duration: 5 },
+      _attachments: {
+        xml: { content_type: 'application/octet-stream', data: Buffer.from(secondXML).toString('base64') },
+      },
+    };
+
+    const expiredTrainingXML = fs.readFileSync(`${FORMS_FOLDER}/expired-training.xml`, 'utf8');
+    const expiredTraining = {
+      _id: 'form:training:expired_training',
+      internalId: 'training:expired_training',
+      title: 'expired_training',
+      type: 'form',
+      context: { start_date: '2023-12-8', user_roles: [ 'pharmacist' ], duration: 50 },
+      _attachments: {
+        xml: { content_type: 'application/octet-stream', data: Buffer.from(expiredTrainingXML).toString('base64') },
+      },
+    };
+
+    await utils.saveDocs([ facility, firstTraining, expiredTraining, secondTraining ]);
+    await utils.createUsers([ user ]);
+    await loginPage.login(user);
+  });
+
+  it('should quit training in modal, and be able to complete it later in the Training Material page,' +
+    ' verify completed trainings display in the list', async () => {
+    await trainingCardsPage.waitForTrainingCards();
+    const trainingModalTitle = await trainingCardsPage.getTrainingTitle();
+    expect(trainingModalTitle).to.equal(FIRST_TRAINING_NAME);
+
+    const confirmMessage = await trainingCardsPage.quitTraining();
+    expect(confirmMessage.header).to.equal(CONFIRM_TITLE);
+    expect(confirmMessage.body).to.contain(CONFIRM_CONTENT);
+    await trainingCardsPage.confirmQuitTraining();
+    await trainingCardsPage.checkTrainingCardIsNotDisplayed();
+
+    await commonPage.openHamburgerMenu();
+    await commonPage.openTrainingMaterials();
+
+    const trainings = await trainingCardsPage.getAllTrainingsText();
+    expect(trainings.length).to.equal(2);
+    expect(trainings).to.have.members([ FIRST_TRAINING_NAME, SECOND_TRAINING_NAME ]);
+    expect(await trainingCardsPage.isTrainingComplete(FIRST_TRAINING_ID)).to.be.false;
+    expect(await trainingCardsPage.isTrainingComplete(SECOND_TRAINING_ID)).to.be.false;
+
+    await trainingCardsPage.openTrainingMaterial(FIRST_TRAINING_ID);
+    const trainingMaterialTitle = await trainingCardsPage.getTrainingTitle();
+    expect(trainingMaterialTitle).to.equal(FIRST_TRAINING_NAME);
+
+    const introCard = await trainingCardsPage.getCardContent(FIRST_TRAINING_NAME, 'intro/intro_note_1:label"]');
+    expect(introCard).to.equal(
+      'There have been some changes to icons in your app. The next few screens will show you the difference.'
+    );
+    const nextCard = await trainingCardsPage.getNextCardContent(
+      FIRST_TRAINING_NAME,
+      'action_icons/action_icons_note_1:label"]',
+    );
+    expect(nextCard).to.equal('The "New Action" icon at the bottom of your app has also changed.');
+    const lastCard = await trainingCardsPage.getNextCardContent(FIRST_TRAINING_NAME, 'ending/ending_note_1:label"]');
+    expect(lastCard).to.equal('If you do not understand these changes, please contact your supervisor.');
+    await trainingCardsPage.submitTraining(false);
+
+    const allTrainings = await trainingCardsPage.getAllTrainingsText();
+    expect(allTrainings.length).to.equal(2);
+    expect(allTrainings).to.have.members([ FIRST_TRAINING_NAME, SECOND_TRAINING_NAME ]);
+    expect(await trainingCardsPage.isTrainingComplete(FIRST_TRAINING_ID)).to.be.true;
+    expect(await trainingCardsPage.isTrainingComplete(SECOND_TRAINING_ID)).to.be.false;
+
+    await commonPage.goToReports();
+    const firstReport = await reportsPage.getListReportInfo(await reportsPage.leftPanelSelectors.firstReport());
+    expect(firstReport.form).to.equal(FIRST_TRAINING_ID);
+  });
+
+  it('should revisit completed trainings and load uncompleted trainings', async () => {
+    await commonPage.openHamburgerMenu();
+    await commonPage.openTrainingMaterials();
+
+    const trainings = await trainingCardsPage.getAllTrainingsText();
+    expect(trainings.length).to.equal(2);
+    expect(trainings).to.have.members([ FIRST_TRAINING_NAME, SECOND_TRAINING_NAME ]);
+    expect(await trainingCardsPage.isTrainingComplete(FIRST_TRAINING_ID)).to.be.true;
+    expect(await trainingCardsPage.isTrainingComplete(SECOND_TRAINING_ID)).to.be.false;
+
+    await trainingCardsPage.openTrainingMaterial(FIRST_TRAINING_ID);
+    const trainingMaterialTitle = await trainingCardsPage.getTrainingTitle();
+    expect(trainingMaterialTitle).to.equal(FIRST_TRAINING_NAME);
+
+    const introCard = await trainingCardsPage.getCardContent(FIRST_TRAINING_NAME, 'intro/intro_note_1:label"]');
+    expect(introCard).to.equal(
+      'There have been some changes to icons in your app. The next few screens will show you the difference.'
+    );
+    const nextCard = await trainingCardsPage.getNextCardContent(
+      FIRST_TRAINING_NAME,
+      'action_icons/action_icons_note_1:label"]',
+    );
+    expect(nextCard).to.equal('The "New Action" icon at the bottom of your app has also changed.');
+
+    const confirmMessage = await trainingCardsPage.quitTraining();
+    expect(confirmMessage.header).to.equal(CONFIRM_TITLE);
+    expect(confirmMessage.body).to.contain(CONFIRM_CONTENT);
+    await trainingCardsPage.confirmQuitTraining();
+    await trainingCardsPage.checkTrainingCardIsNotDisplayed();
+
+    await trainingCardsPage.openTrainingMaterial(SECOND_TRAINING_ID);
+    const secondTrainingTitle = await trainingCardsPage.getTrainingTitle();
+    expect(secondTrainingTitle).to.equal(SECOND_TRAINING_NAME);
+    const secondIntroCard = await trainingCardsPage.getCardContent(SECOND_TRAINING_NAME, 'intro/intro_note_1:label"]');
+    expect(secondIntroCard).to.equal(
+      'The next few screens will show you the difference.'
+    );
+
+    const secondConfirmMessage = await trainingCardsPage.quitTraining();
+    expect(secondConfirmMessage.header).to.equal(CONFIRM_TITLE);
+    expect(secondConfirmMessage.body).to.contain(CONFIRM_CONTENT);
+    await trainingCardsPage.confirmQuitTraining();
+    await trainingCardsPage.checkTrainingCardIsNotDisplayed();
+
+    const allTrainings = await trainingCardsPage.getAllTrainingsText();
+    expect(allTrainings.length).to.equal(2);
+    expect(allTrainings).to.have.members([ FIRST_TRAINING_NAME, SECOND_TRAINING_NAME ]);
+    expect(await trainingCardsPage.isTrainingComplete(FIRST_TRAINING_ID)).to.be.true;
+    expect(await trainingCardsPage.isTrainingComplete(SECOND_TRAINING_ID)).to.be.false;
+  });
+});
diff --git a/tests/e2e/default/transitions/client-side-muting.wdio-spec.js b/tests/e2e/default/transitions/client-side-muting.wdio-spec.js
index 18c5304f32d..ea4d896a6ee 100644
--- a/tests/e2e/default/transitions/client-side-muting.wdio-spec.js
+++ b/tests/e2e/default/transitions/client-side-muting.wdio-spec.js
@@ -141,7 +141,7 @@ describe.skip('Muting', () => {
   };
 
   const restartSentinel = async (sync = false) => {
-    await utils.startSentinel();
+    await utils.toggleSentinelTransitions();
     await sentinelUtils.waitForSentinel();
     await browser.refresh();
     sync && await commonPage.sync();
@@ -195,7 +195,7 @@ describe.skip('Muting', () => {
 
     it('should not process client-side when muting as an online user', async () => {
       await loginPage.login({username: onlineUser.username, password: onlineUser.password});
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await utils.updateSettings(settings);
 
       await muteClinic(clinic1);
@@ -274,7 +274,7 @@ describe.skip('Muting', () => {
       const settingsWithDisabled = _.cloneDeep(settings);
       settingsWithDisabled.transitions.muting = { client_side: false };
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settingsWithDisabled);
 
       await muteClinic(clinic2, true);
@@ -292,7 +292,7 @@ describe.skip('Muting', () => {
 
     // for simplicity, offline means sentinel is stopped
     it( 'should mute and unmute a person while "offline", with processing in between', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await mutePerson(patient1, true);
@@ -333,7 +333,7 @@ describe.skip('Muting', () => {
       await commonPage.waitForLoaders();
       expectUnmutedNoHistory(await utils.getDoc(clinic1._id));
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
 
       await unmutePerson(patient1, true);
 
@@ -382,7 +382,7 @@ describe.skip('Muting', () => {
     });
 
     it( 'should mute and unmute a person while "offline", without processing in between', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await mutePerson(patient1, true);
@@ -448,7 +448,7 @@ describe.skip('Muting', () => {
     });
 
     it( 'should mute and unmute a clinic while "offline", with processing in between', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await muteClinic(clinic1, true);
@@ -520,7 +520,7 @@ describe.skip('Muting', () => {
       const patient1ServerMutingDate = updatedPatient1.muted;
       const clinic1ServerMutingDate = updatedClinic1.muted;
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
 
       await unmuteClinic(clinic1, true);
 
@@ -594,7 +594,7 @@ describe.skip('Muting', () => {
     });
 
     it( 'should mute and unmute a clinic while "offline", without processing in between', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await muteClinic(clinic1, true);
@@ -695,7 +695,7 @@ describe.skip('Muting', () => {
     });
 
     it( 'should mute a clinic and unmute a patient while "offline", without processing in between', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await muteClinic(clinic1, true);
@@ -826,7 +826,7 @@ describe.skip('Muting', () => {
 
     it( 'should handle offline multiple muting/unmuting events gracefully', async () => {
       // this test has value after it ran for at least 100 times
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
       await commonPage.waitForLoaders();
       await muteClinic(clinic1);
@@ -885,7 +885,7 @@ describe.skip('Muting', () => {
         ],
       };
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settingsWithValidations);
 
       await mutePerson(patient1);
@@ -914,7 +914,7 @@ describe.skip('Muting', () => {
     });
 
     it( 'should work with composite forms', async () => {
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       await updateClientSideMutingSettings(settings);
 
       await commonPage.goToPeople(healthCenter._id);
diff --git a/tests/e2e/default/transitions/create-user-for-contacts.create-user.wdio-spec.js b/tests/e2e/default/transitions/create-user-for-contacts.create-user.wdio-spec.js
index 4f3bb54d4e3..066e60e973d 100644
--- a/tests/e2e/default/transitions/create-user-for-contacts.create-user.wdio-spec.js
+++ b/tests/e2e/default/transitions/create-user-for-contacts.create-user.wdio-spec.js
@@ -78,8 +78,7 @@ describe('Create user when adding contact', () => {
     NEW_USERS.length = 0;
     await utils.revertDb([/^form:/], true);
     await sentinelUtils.waitForSentinel();
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
   });
 
   it('Creates a new user while offline', async () => {
@@ -166,7 +165,7 @@ describe('Create user when adding contact', () => {
 
   it('creates a new user when Sentinel recovers from outage', async () => {
     await utils.updateSettings(createSettings(true), {ignoreReload: 'sentinel'});
-    await utils.stopSentinel();
+    await utils.toggleSentinelTransitions();
     await cookieLogin();
     await commonPage.goToPeople(district._id);
     await contactsPage.addPerson({ name: CONTACT_NAME, phone: '+40755696969' }, false);
@@ -182,7 +181,7 @@ describe('Create user when adding contact', () => {
     const userSettings = await utils.getUserSettings({ contactId: chwContactId });
     expect(userSettings).to.be.empty;
 
-    await utils.startSentinel();
+    await utils.toggleSentinelTransitions();
     await verifyUserCreation();
   });
 });
diff --git a/tests/e2e/default/transitions/create-user-for-contacts.replace-user.wdio-spec.js b/tests/e2e/default/transitions/create-user-for-contacts.replace-user.wdio-spec.js
index 38c4cfd8cf5..a67c72d1c3d 100644
--- a/tests/e2e/default/transitions/create-user-for-contacts.replace-user.wdio-spec.js
+++ b/tests/e2e/default/transitions/create-user-for-contacts.replace-user.wdio-spec.js
@@ -109,7 +109,7 @@ describe('Create user for contacts', () => {
       path: '/medic/login',
       body: { user: username, password, locale: 'en' },
       method: 'POST',
-      simple: false,
+      resolveWithFullResponse: true,
       noAuth: true,
     };
     return utils.request(opts);
@@ -118,7 +118,7 @@ describe('Create user for contacts', () => {
   const assertUserPasswordChanged = async (user) => {
     // Cannot login because user's password has been automatically reset
     const resp0 = await submitLoginRequest(user);
-    expect(resp0.statusCode).to.equal(401);
+    expect(resp0.status).to.equal(401);
 
     // Update user's password to something we know
     await utils.request({
@@ -129,7 +129,7 @@ describe('Create user for contacts', () => {
 
     // Can login with new password
     const resp1 = await submitLoginRequest({ ...user, password: DISABLED_USER_PASSWORD });
-    expect(resp1.statusCode).to.equal(302);
+    expect(resp1.status).to.equal(302);
   };
 
   const assertNewUserSettings = (newUserSettings, newContact, originalUser) => {
@@ -169,8 +169,7 @@ describe('Create user for contacts', () => {
     NEW_USERS.length = 0;
     await utils.revertDb([/^form:/], true);
     await sentinelUtils.waitForSentinel();
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
   });
 
   describe('user replace', () => {
@@ -758,8 +757,7 @@ describe('Create user for contacts', () => {
         expect(districtFromRemote.contact._id).to.equal(replacementContactId);
 
         // Subsequent form reports are *not* re-parented to the new contact
-        await browser.reloadSession();
-        await browser.url('/');
+        await commonPage.reloadSession();
         await loginPage.login(ORIGINAL_USER);
         await commonPage.waitForPageLoaded();
         await browser.throttle('offline');
@@ -801,7 +799,7 @@ describe('Create user for contacts', () => {
       expect(updatedOriginalContact.user_for_contact).to.be.undefined;
       // Can still login as original user
       const resp1 = await submitLoginRequest(ONLINE_USER);
-      expect(resp1.statusCode).to.equal(302);
+      expect(resp1.status).to.equal(302);
       // New user not created
       const newUserSettings = await utils.getUserSettings({ contactId: replacementContactId });
       expect(newUserSettings).to.be.empty;
diff --git a/tests/e2e/default/translations/enabled-languages.wdio-spec.js b/tests/e2e/default/translations/enabled-languages.wdio-spec.js
index f176d1b53f1..c317e5e813f 100644
--- a/tests/e2e/default/translations/enabled-languages.wdio-spec.js
+++ b/tests/e2e/default/translations/enabled-languages.wdio-spec.js
@@ -1,6 +1,7 @@
 const utils = require('@utils');
 const loginPage = require('@page-objects/default/login/login.wdio.page');
 const adminPage = require('@page-objects/default/admin/admin.wdio.page');
+const commonPage = require('@page-objects/default/common/common.wdio.page');
 
 describe('Enabling/disabling languages', () => {
   const SETTINGS = {
@@ -17,8 +18,7 @@ describe('Enabling/disabling languages', () => {
 
   it('should disable a language and enable another', async () => {
     await utils.updateSettings(SETTINGS, { ignoreReload: true });
-    await browser.reloadSession();
-    await browser.url('/');
+    await commonPage.reloadSession();
 
     // assert English, Spanish, and French are available on the login page
     let locales = await loginPage.getAllLocales();
diff --git a/tests/e2e/default/translations/incorrect-locale.wdio-spec.js b/tests/e2e/default/translations/incorrect-locale.wdio-spec.js
index b930e192255..f1d4faec636 100644
--- a/tests/e2e/default/translations/incorrect-locale.wdio-spec.js
+++ b/tests/e2e/default/translations/incorrect-locale.wdio-spec.js
@@ -4,7 +4,6 @@ const userSettingsElements = require('@page-objects/default/users/user-settings.
 const contactElements = require('@page-objects/default/contacts/contacts.wdio.page');
 const loginPage = require('@page-objects/default/login/login.wdio.page');
 const placeFactory = require('@factories/cht/contacts/place');
-const sentinelUtils = require('@utils/sentinel');
 const commonPage = require('@page-objects/default/common/common.wdio.page');
 
 describe('Testing Incorrect locale', () => {
@@ -31,10 +30,15 @@ describe('Testing Incorrect locale', () => {
     await utils.enableLanguage(LANGUAGE_CODE);
   };
 
-  before(async () => {
+  beforeEach(async () => {
     await loginPage.cookieLogin();
     await utils.saveDoc(place);
-    await sentinelUtils.waitForSentinel();
+  });
+
+  afterEach(async () => {
+    await utils.deleteDocs([ place._id, `messages-${LANGUAGE_CODE}` ]);
+    await utils.revertSettings(true);
+    await commonElements.reloadSession();
   });
   
   it('should work with incorrect locale', async () => {
@@ -57,9 +61,5 @@ describe('Testing Incorrect locale', () => {
 
     const tasksFilter = await contactElements.getReportTaskFiltersText();
     expect(tasksFilter.sort()).to.deep.equal(['1 saptamana', '2 saptamani', 'View all'].sort());
-
-    await utils.revertSettings(true);
-    await utils.deleteDocs([ place._id, `messages-${LANGUAGE_CODE}` ]);
-    await browser.setCookies({ name: 'locale', value: 'en' });
   });
 });
diff --git a/tests/e2e/upgrade/upgrade.wdio-spec.js b/tests/e2e/upgrade/upgrade.wdio-spec.js
index 6891d0204fb..451aab3611a 100644
--- a/tests/e2e/upgrade/upgrade.wdio-spec.js
+++ b/tests/e2e/upgrade/upgrade.wdio-spec.js
@@ -119,8 +119,7 @@ describe('Performing an upgrade', () => {
 
   (testFrontend ? it : xit)('should display current branch in the about page', async () => {
     await loginPage.login({ username: docs.user.username, password: docs.user.password });
-    await commonPage.sync(true);
-    await browser.refresh();
+    await commonPage.sync({ expectReload: true, reload: true });
     await commonPage.waitForPageLoaded();
 
     await commonPage.goToAboutPage();
diff --git a/tests/e2e/upgrade/wdio.conf.js b/tests/e2e/upgrade/wdio.conf.js
index 2c0b5947dda..8c32ab1e228 100644
--- a/tests/e2e/upgrade/wdio.conf.js
+++ b/tests/e2e/upgrade/wdio.conf.js
@@ -6,13 +6,13 @@ const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const chai = require('chai');
-const { spawn } = require('child_process');
 chai.use(require('chai-exclude'));
 const rpn = require('request-promise-native');
 const semver = require('semver');
 
 const utils = require('@utils');
 const wdioBaseConfig = require('../../wdio.conf');
+const { generateReport } = require('@utils/allure');
 
 const {
   MARKET_URL_READ = 'https://staging.dev.medicmobile.org',
@@ -75,49 +75,30 @@ const getMainCHTDockerCompose = async () => {
 };
 
 const TEST_TIMEOUT = 240 * 1000; // 4 minutes
+const env = {
+  ...process.env,
+  HAPROXY_PORT,
+  CHT_COMPOSE_PATH: CHT_DOCKER_COMPOSE_FOLDER,
+  COUCHDB_USER: constants.USERNAME,
+  COUCHDB_PASSWORD: constants.PASSWORD,
+  DOCKER_CONFIG_PATH: os.homedir(),
+  COUCHDB_DATA: CHT_DATA_FOLDER,
+  CHT_COMPOSE_PROJECT_NAME: CHT_COMPOSE_PROJECT_NAME,
+  CHT_NETWORK: 'cht-net-upgrade',
+};
 
-const dockerComposeCmd = (...params) => {
-  const env = {
-    ...process.env,
-    HAPROXY_PORT,
-    CHT_COMPOSE_PATH: CHT_DOCKER_COMPOSE_FOLDER,
-    COUCHDB_USER: constants.USERNAME,
-    COUCHDB_PASSWORD: constants.PASSWORD,
-    DOCKER_CONFIG_PATH: os.homedir(),
-    COUCHDB_DATA: CHT_DATA_FOLDER,
-    CHT_COMPOSE_PROJECT_NAME: CHT_COMPOSE_PROJECT_NAME,
-    CHT_NETWORK: 'cht-net-upgrade',
-  };
+const upgradeServiceCmd = (command) => {
+  command = `docker compose -f ${UPGRADE_SERVICE_DC} -p upgrade ${command}`;
 
-  params.unshift('-p', 'upgrade');
-
-  return new Promise((resolve, reject) => {
-    console.log(...['docker compose', '-f', UPGRADE_SERVICE_DC, ...params]);
-    const cmd = spawn('docker', ['compose', '-f', UPGRADE_SERVICE_DC, ...params], { env });
-    const output = [];
-    const log = (data, error) => {
-      data = data.toString();
-      output.push(data);
-      error ? console.error(data) : console.log(data);
-    };
-
-    cmd.on('error', (err) => {
-      console.error(err);
-      reject(err);
-    });
-    cmd.stdout.on('data', log);
-    cmd.stderr.on('data', log);
-
-    cmd.on('close', () => resolve(output));
-  });
+  return utils.runCommand(command, { verbose: true, overrideEnv: env });
 };
-const exit = () => dockerComposeCmd('down');
+const exit = () => upgradeServiceCmd('down');
 
 const startUpgradeService = async () => {
-  await dockerComposeCmd('up', '-d');
+  await upgradeServiceCmd('up -d');
   let retries = 20;
   do {
-    const response = await dockerComposeCmd('ps', '-q');
+    const response = await upgradeServiceCmd('ps -q');
     if (response.length) {
       return;
     }
@@ -125,6 +106,16 @@ const startUpgradeService = async () => {
   } while (--retries);
 };
 
+const tearDownServices = async () => {
+  const composeFilesParam = COMPOSE_FILES
+    .map(composeFile => '-f ' + path.join(CHT_DOCKER_COMPOSE_FOLDER, `${composeFile}.yml`))
+    .join(' ');
+  const cmd = `docker compose ${composeFilesParam} -p ${CHT_COMPOSE_PROJECT_NAME} down -t 0 --remove-orphans --volumes`;
+  await utils.runCommand(cmd, { verbose: true, overrideEnv: env });
+
+  await exit();
+};
+
 const servicesStartTimeout = () => {
   return setTimeout(async () => {
     console.warn('Services took too long to start. Shutting down...');
@@ -133,7 +124,7 @@ const servicesStartTimeout = () => {
       allotted time.
       Either run the test multiple times until you load all images, download images manually or increase this timeout.
     `);
-    await utils.tearDownServices();
+    await tearDownServices();
     process.exit(1);
   }, TEST_TIMEOUT);
 };
@@ -160,6 +151,12 @@ const upgradeConfig = Object.assign(wdioBaseConfig.config, {
     await utils.listenForApi();
     clearTimeout(tooLongTimeout);
   },
+
+  onComplete: async () => {
+    await tearDownServices();
+    await generateReport();
+  },
+
   mochaOpts: {
     ui: 'bdd',
     timeout: TEST_TIMEOUT,
diff --git a/tests/e2e/visual/contacts/config/contact-summary-extras.js b/tests/e2e/visual/contacts/config/contact-summary-extras.js
new file mode 100644
index 00000000000..a2db24950ee
--- /dev/null
+++ b/tests/e2e/visual/contacts/config/contact-summary-extras.js
@@ -0,0 +1,590 @@
+const moment = require('moment');
+const today = moment().startOf('day');
+const now = Date.now();
+
+const pregnancyForms = ['pregnancy'];
+const antenatalForms = ['pregnancy_home_visit'];
+const deliveryForms = ['delivery'];
+const pregnancDangerSignForms = [
+  'pregnancy',
+  'pregnancy_home_visit',
+  'pregnancy_danger_sign',
+  'pregnancy_danger_sign_follow_up'
+];
+const MAX_DAYS_IN_PREGNANCY = 42 * 7;
+const AVG_DAYS_IN_PREGNANCY = 280;
+const IMMUNIZATION_DOSES = [
+  ['hep_a_1', 'HA1'],
+  ['hep_a_2', 'HA2'],
+  ['flu', 'FLU'],
+  ['polio_0', 'OPV0'],
+  ['polio_1', 'OPV1'],
+  ['polio_2', 'OPV2'],
+  ['polio_3', 'OPV3'],
+  ['penta_1', 'PENTA1'],
+  ['penta_2', 'PENTA2'],
+  ['penta_3', 'PENTA3'],
+  ['rotavirus_1', 'ROTA1'],
+  ['rotavirus_2', 'ROTA2'],
+  ['rotavirus_3', 'ROTA3']
+];
+const IMMUNIZATION_LIST = [
+  'hep_a',
+  'flu',
+  'polio',
+  'penta',
+  'rotavirus'
+];
+const immunizationForms = [
+  'PENTA1',
+  'PENTA2',
+  'PENTA3',
+  'OPV0',
+  'OPV1',
+  'OPV2',
+  'OPV3',
+  'ROTA1',
+  'ROTA2',
+  'ROTA3',
+  'FLU',
+  'HA1',
+  'HA2'
+];
+
+const isReportValid = (report) => {
+  return (
+    report.form &&
+    report.fields &&
+    report.reported_date
+  );
+};
+
+const getField = (report, fieldPath) => ['fields', ...(fieldPath || '').split('.')]
+  .reduce((prev, fieldName) => {
+    if (prev === undefined) {
+      return undefined;
+    }
+    return prev[fieldName];
+  }, report);
+
+const getFormArraySubmittedInWindow = (allReports, formArray, start, end) => allReports.filter(
+  (report) => formArray.includes(report.form) &&
+      report.reported_date >= start &&
+      report.reported_date <= end
+);
+
+const getNewestReport = (allReports, forms) => {
+  const result = allReports
+    .filter((report) => isReportValid(report) && forms.includes(report.form))
+    .reduce((newest, report) => {
+      return !newest || report.reported_date > newest.reported_date ? report : newest;
+    }, null);
+
+  return result;
+};
+
+const getLMPDateFromPregnancy = (report) => {
+  const lmpDate = getField(report, 'lmp_date_8601');
+  return isPregnancyForm(report) && lmpDate && moment(lmpDate);
+};
+
+const getLMPDateFromPregnancyFollowUp = (report) => {
+  const lmpDate = getField(report, 'lmp_date_8601');
+  return isPregnancyFollowUpForm(report) && lmpDate && moment(lmpDate);
+};
+
+const getMostRecentLMPDateForPregnancy = (allReports, pregnancyReport) => {
+  let mostRecentLMP = getLMPDateFromPregnancy(pregnancyReport);
+  let mostRecentReportDate = pregnancyReport.reported_date;
+
+  getSubsequentPregnancyFollowUps(allReports, pregnancyReport).forEach((visit) => {
+    const lmpFromPregnancyFollowUp = getLMPDateFromPregnancyFollowUp(visit);
+    const lmpUpdated = getField(visit, 'lmp_updated') === 'yes';
+
+    if (visit.reported_date > mostRecentReportDate && lmpUpdated) {
+      mostRecentReportDate = visit.reported_date;
+      mostRecentLMP = lmpFromPregnancyFollowUp;
+    }
+  });
+
+  return mostRecentLMP;
+};
+
+const getMostRecentEDDForPregnancy = (allReports, report) => {
+  const lmpDate = getMostRecentLMPDateForPregnancy(allReports, report);
+
+  if (!lmpDate) {
+    return;
+  }
+
+  return lmpDate.clone().add(AVG_DAYS_IN_PREGNANCY, 'days');
+};
+
+const getDeliveryDate = (report) => {
+  const deliveryDate = getField(report, 'delivery_outcome.delivery_date');
+
+  return isDeliveryForm(report) && deliveryDate && moment(deliveryDate);
+};
+
+const getNextANCVisitDate = (allReports, report) => {
+  let nextVisit = getField(report, 't_pregnancy_follow_up_date');
+  let eddReportDate = report.reported_date;
+
+  const followUps = getSubsequentPregnancyFollowUps(allReports, report);
+
+  followUps.forEach((followUpReport) => {
+    const followUpDate = getField(followUpReport, 't_pregnancy_follow_up_date');
+
+    if (followUpReport.reported_date > eddReportDate && followUpDate) {
+      eddReportDate = followUpReport.reported_date;
+      nextVisit = followUpDate;
+    }
+  });
+
+  return moment(nextVisit);
+};
+
+const getDangerSignCodes = (report) => {
+  const dangerSignCodes = [];
+
+  if (getField(report, 't_danger_signs_referral_follow_up') === 'yes') {
+    const dangerSignsObj = getField(report, 'danger_signs');
+
+    if (dangerSignsObj) {
+      Object.keys(dangerSignsObj).forEach((dangerSign) => {
+        if (dangerSignsObj[dangerSign] === 'yes' && dangerSign !== 'r_danger_sign_present') {
+          dangerSignCodes.push(dangerSign);
+        }
+      });
+    }
+  }
+
+  return dangerSignCodes;
+};
+
+const getLatestDangerSignsForPregnancy = (allReports, pregnancy) => {
+  if (!pregnancy) {
+    return [];
+  }
+
+  let lmpDate = getMostRecentLMPDateForPregnancy(allReports, pregnancy);
+  if (!lmpDate) {
+    lmpDate = moment(pregnancy.reported_date);
+  }
+
+  const allReportsWithDangerSigns = getFormArraySubmittedInWindow(
+    allReports,
+    pregnancDangerSignForms,
+    lmpDate.toDate(),
+    lmpDate.clone().add(MAX_DAYS_IN_PREGNANCY, 'days').toDate()
+  );
+
+  const allRelevantReports = [];
+  allReportsWithDangerSigns.forEach((report) => {
+    if (isPregnancyFollowUpForm(report)) {
+      if (getField(report, 'pregnancy_summary.visit_option') === 'yes') {
+        allRelevantReports.push(report);
+      }
+    } else {
+      allRelevantReports.push(report);
+    }
+  });
+
+  const recentReport = getNewestReport(allRelevantReports, pregnancDangerSignForms);
+  if (!recentReport) {
+    return [];
+  }
+
+  return getDangerSignCodes(recentReport);
+};
+
+
+const getRiskFactorsFromPregnancy = (report) => {
+  const riskFactors = [];
+
+  if (!isPregnancyForm(report)) {
+    return [];
+  }
+
+  if (getField(report, 'risk_factors.r_risk_factor_present') === 'yes') {
+    if (getField(report, 'risk_factors.risk_factors_history.first_pregnancy') === 'yes') {
+      riskFactors.push('first_pregnancy');
+    }
+
+    if (getField(report, 'risk_factors.risk_factors_history.previous_miscarriage') === 'yes') {
+      riskFactors.push('previous_miscarriage');
+    }
+
+    const riskFactorsPrimary = getField(report, 'risk_factors.risk_factors_present.primary_condition');
+    const riskFactorsSecondary = getField(report, 'risk_factors.risk_factors_present.secondary_condition');
+
+    if (riskFactorsPrimary) {
+      riskFactors.push(...riskFactorsPrimary.split(' '));
+    }
+
+    if (riskFactorsSecondary) {
+      riskFactors.push(...riskFactorsSecondary.split(' '));
+    }
+  }
+
+  return riskFactors;
+};
+
+const getNewRiskFactorsFromFollowUps = (report) => {
+  const riskFactors = [];
+
+  if (!isPregnancyFollowUpForm(report)) {
+    return [];
+  }
+
+  if (getField(report, 'anc_visits_hf.risk_factors.r_risk_factor_present') === 'yes') {
+    const newRiskFactors = getField(report, 'anc_visits_hf.risk_factors.new_risks');
+
+    if (newRiskFactors) {
+      riskFactors.push(...newRiskFactors.split(' '));
+    }
+  }
+
+  return riskFactors;
+};
+
+const getAllRiskFactors = (allReports, pregnancy) => {
+  const riskFactorCodes = getRiskFactorsFromPregnancy(pregnancy);
+  const pregnancyFollowUps = getSubsequentPregnancyFollowUps(allReports, pregnancy);
+
+  pregnancyFollowUps.forEach((visit) => {
+    riskFactorCodes.push(...getNewRiskFactorsFromFollowUps(visit));
+  });
+
+  return riskFactorCodes;
+};
+
+const getRiskFactorExtra = (report) => {
+  if (!report){
+    return;
+  }
+
+  if (isPregnancyForm(report)) {
+    return getField(report, 'risk_factors.risk_factors_present.additional_risk');
+  }
+
+  if (isPregnancyFollowUpForm(report)) {
+    return getField(report, 'anc_visits_hf.risk_factors.additional_risk');
+  }
+};
+
+const getAllRiskFactorExtra = (allReports, pregnancy) => {
+  const riskFactorsExtra = [];
+
+  const riskFactorExtraFromPregnancy = getRiskFactorExtra(pregnancy);
+  if (riskFactorExtraFromPregnancy) {
+    riskFactorsExtra.push(riskFactorExtraFromPregnancy);
+  }
+
+  const pregnancyFollowUps = getSubsequentPregnancyFollowUps(allReports, pregnancy);
+  pregnancyFollowUps.forEach((visit) => {
+    const riskFactorExtraFromVisit = getRiskFactorExtra(visit);
+    if (riskFactorExtraFromVisit) {
+      riskFactorsExtra.push(riskFactorExtraFromVisit);
+    }
+  });
+
+  return riskFactorsExtra;
+};
+
+const isHighRiskPregnancy = (allReports, pregnancy) => {
+  const riskFactors = getAllRiskFactors(allReports, pregnancy);
+  const riskFactorExtra = getAllRiskFactorExtra(allReports, pregnancy);
+  const dangerSigns = getDangerSignCodes(pregnancy);
+
+  return riskFactors.length > 0 || riskFactorExtra.length > 0 || dangerSigns.length > 0;
+};
+
+const isAlive = (thisContact) => thisContact && !thisContact.date_of_death;
+
+const isPregnancyForm = (report) => report && pregnancyForms.includes(report.form);
+
+const isPregnancyFollowUpForm = (report) => report && antenatalForms.includes(report.form);
+
+const isDeliveryForm = (report) => report && deliveryForms.includes(report.form);
+
+const getSubsequentPregnancies = (allReports, refReport) => allReports.filter(
+  (report) => isPregnancyForm(report) &&
+      report.reported_date > refReport.reported_date
+);
+
+const isActivePregnancy = (thisContact, allReports, report) => {
+  if (
+    thisContact.type !== 'person' ||
+    !isAlive(thisContact) ||
+    !isPregnancyForm(report)
+  ) {
+    return false;
+  }
+
+  const lmpDate =
+    getMostRecentLMPDateForPregnancy(allReports, report) ||
+    report.reported_date;
+
+  const isPregnancyRegisteredWithin9Months =
+    lmpDate > today.clone().subtract(MAX_DAYS_IN_PREGNANCY, 'days');
+
+  const isPregnancyTerminatedByDeliveryInLast6Weeks =
+    getSubsequentDeliveries(allReports, report, 6 * 7).length > 0;
+
+  const isPregnancyTerminatedByAnotherPregnancyReport =
+    getSubsequentPregnancies(allReports, report).length > 0;
+
+  return (
+    isPregnancyRegisteredWithin9Months &&
+    !isPregnancyTerminatedByDeliveryInLast6Weeks &&
+    !isPregnancyTerminatedByAnotherPregnancyReport &&
+    !getRecentANCVisitWithEvent(allReports, report, 'abortion') &&
+    !getRecentANCVisitWithEvent(allReports, report, 'miscarriage')
+  );
+};
+
+const isPregnant = (allReports) => allReports.some((report) => isActivePregnancy(report));
+
+const isReadyForNewPregnancy = (thisContact, allReports) => {
+  if (thisContact.type !== 'person') {
+    return false;
+  }
+
+  const mostRecentPregnancyReport = getNewestReport(allReports, pregnancyForms);
+  const mostRecentDeliveryReport = getNewestReport(allReports, deliveryForms);
+
+  if (!mostRecentPregnancyReport && !mostRecentDeliveryReport) {
+    // No previous pregnancy or delivery recorded, fresh profile
+    return true;
+  }
+
+  if (!mostRecentPregnancyReport) {
+    // Delivery report without pregnancy report
+    const deliveryDate = getDeliveryDate(mostRecentDeliveryReport);
+    return deliveryDate && deliveryDate < today.clone().subtract(6 * 7, 'day');
+  }
+
+  const isPregnancyNewer =
+    !mostRecentDeliveryReport ||
+    mostRecentDeliveryReport.reported_date < mostRecentPregnancyReport.reported_date;
+
+  if (isPregnancyNewer) {
+    // Pregnancy report newer than delivery or no delivery report
+    const lmpDate =
+      getMostRecentLMPDateForPregnancy(allReports, mostRecentPregnancyReport) ||
+      moment(mostRecentPregnancyReport.reported_date);
+
+    if (lmpDate < today.clone().subtract(MAX_DAYS_IN_PREGNANCY, 'day')) {
+      return true;
+    }
+
+    return (
+      getRecentANCVisitWithEvent(allReports, mostRecentPregnancyReport, 'abortion') ||
+      getRecentANCVisitWithEvent(allReports, mostRecentPregnancyReport, 'miscarriage')
+    );
+  }
+
+  // Both pregnancy and delivery report; delivery report is newer
+  return (
+    getRecentANCVisitWithEvent(allReports, mostRecentPregnancyReport, 'abortion') ||
+    getRecentANCVisitWithEvent(allReports, mostRecentPregnancyReport, 'miscarriage')
+  );
+};
+
+const isReadyForDelivery = (thisContact, allReports) => {
+  if (thisContact.type !== 'person') {
+    return false;
+  }
+
+  const latestPregnancy = getNewestReport(allReports, pregnancyForms);
+  const latestDelivery = getNewestReport(allReports, deliveryForms);
+
+  if (!latestPregnancy && !latestDelivery) {
+    // No previous pregnancy or delivery
+    return true;
+  }
+
+  if (
+    latestDelivery &&
+    (!latestPregnancy || latestDelivery.reported_date > latestPregnancy.reported_date)
+  ) {
+    // No pregnancy registration; check if previous delivery was at least 7 months ago
+    return getDeliveryDate(latestDelivery) < today.clone().subtract(7, 'months');
+  }
+
+  if (latestPregnancy) {
+    const lmpDate = getMostRecentLMPDateForPregnancy(allReports, latestPregnancy);
+    if (!lmpDate) {
+      // No LMP; show readiness until 280 days + 6 weeks from the registration date
+      return moment(latestPregnancy.reported_date)
+        .clone()
+        .startOf('day')
+        .add(280 + 6 * 7, 'days')
+        .isSameOrBefore(today);
+    }
+
+    const edd = getMostRecentEDDForPregnancy(allReports, latestPregnancy);
+    // Pregnancy registration with LMP; check readiness between 6 months after LMP and EDD + 6 weeks
+    return today.isBetween(
+      lmpDate.clone().add(6, 'months'),
+      edd.clone().add(6, 'weeks')
+    );
+  }
+
+  return false;
+};
+
+const getRecentANCVisitWithEvent = (allReports, pregnancyReport, event) => {
+  const followUps = getSubsequentPregnancyFollowUps(allReports, pregnancyReport);
+  const latestFollowUp = getNewestReport(followUps, antenatalForms);
+
+  return latestFollowUp &&
+    getField(latestFollowUp, 'pregnancy_summary.visit_option') === event
+    ? latestFollowUp
+    : undefined;
+};
+
+const getSubsequentDeliveries = (allReports, pregnancyReport, withinLastXDays) => allReports.filter((report) => {
+  const isAfterPregnancy = report.reported_date > pregnancyReport.reported_date;
+  const isWithinDays = !withinLastXDays || report.reported_date >= today.clone().subtract(withinLastXDays, 'days');
+  return isDeliveryForm(report) && isAfterPregnancy && isWithinDays;
+});
+
+const getSubsequentPregnancyFollowUps = (allReports, pregnancyReport) => {
+  const lmpDate = getLMPDateFromPregnancy(pregnancyReport) || moment(pregnancyReport.reported_date);
+
+  return allReports.filter(visitReport => isPregnancyFollowUpForm(visitReport) &&
+    visitReport.reported_date > pregnancyReport.reported_date &&
+    moment(visitReport.reported_date).isBefore(lmpDate.clone().add(MAX_DAYS_IN_PREGNANCY, 'days')));
+};
+
+const countANCFacilityVisits = (allReports, pregnancyReport) => {
+  let ancHFVisits = 0;
+
+  const initialVisits = getField(pregnancyReport, 'anc_visits_hf.anc_visits_hf_past.visited_hf_count');
+  if (initialVisits && !isNaN(initialVisits)) {
+    ancHFVisits += parseInt(initialVisits, 10);
+  }
+
+  const pregnancyFollowUps = getSubsequentPregnancyFollowUps(allReports, pregnancyReport);
+  ancHFVisits += pregnancyFollowUps.reduce((sum, report) => {
+    const pastANCHFVisits = getField(report, 'anc_visits_hf.anc_visits_hf_past');
+
+    if (!pastANCHFVisits) {
+      return sum;
+    }
+
+    if (pastANCHFVisits.last_visit_attended === 'yes') {
+      sum += 1;
+    }
+
+    const otherVisitCount = pastANCHFVisits.visited_hf_count;
+    if (pastANCHFVisits.report_other_visits === 'yes' && !isNaN(otherVisitCount)) {
+      sum += parseInt(otherVisitCount, 10);
+    }
+
+    return sum;
+  }, 0);
+
+  return ancHFVisits;
+};
+
+const knowsHIVStatusInPast3Months = (allReports) => {
+  const pregnancyFormsIn3Months = getFormArraySubmittedInWindow(
+    allReports,
+    pregnancyForms,
+    today.clone().subtract(3, 'months'),
+    today
+  );
+
+  return pregnancyFormsIn3Months.some(
+    (report) => getField(report, 'pregnancy_new_or_current.hiv_status.hiv_status_know') === 'yes'
+  );
+};
+
+const addImmunizations = (master, vaccinesReceived) => {
+  IMMUNIZATION_DOSES.forEach((dose) => {
+    if (!master[dose[0]]) {
+      master[dose[0]] = typeof vaccinesReceived === 'string'
+        ? vaccinesReceived.toUpperCase() === dose[1]
+        : vaccinesReceived[`received_${dose[0]}`] === 'yes';
+    }
+  });
+};
+
+const getAgeInMonths = () => {
+  // eslint-disable-next-line no-undef
+  if (contact.date_of_birth && contact.date_of_birth !== '') {
+    // eslint-disable-next-line no-undef
+    const birthDate = new Date(contact.date_of_birth);
+    const ageInMs = new Date(Date.now() - birthDate.getTime());
+    return (Math.abs(ageInMs.getFullYear() - 1970) * 12) + ageInMs.getMonth();
+  }
+  return null;
+};
+
+const initImmunizations = () => {
+  const master = {};
+  IMMUNIZATION_DOSES.forEach((dose) => {
+    master[dose[0]] = false;
+  });
+  return master;
+};
+
+const isSingleDose = (name) => IMMUNIZATION_DOSES.some((d) => d[0] === name);
+
+const count = (arr, fn) => arr.filter(fn).length;
+
+const countDosesReceived = (master, name) => {
+  return count(IMMUNIZATION_DOSES, (dose) => {
+    return master[dose[0]] && dose[0].startsWith(name + '_');
+  });
+};
+
+const countDosesPossible = name => count(IMMUNIZATION_DOSES, dose => dose[0].startsWith(name + '_'));
+
+const countReportsSubmittedInWindow = (form, end) => {
+  // eslint-disable-next-line no-undef
+  return count(reports, (r) => {
+    return r.reported_date <= end && form.includes(r.form);
+  });
+};
+
+module.exports = {
+  today,
+  MAX_DAYS_IN_PREGNANCY,
+  IMMUNIZATION_LIST,
+  isHighRiskPregnancy,
+  getNewestReport,
+  getSubsequentPregnancyFollowUps,
+  getSubsequentDeliveries,
+  isAlive,
+  isPregnant,
+  isActivePregnancy,
+  countANCFacilityVisits,
+  knowsHIVStatusInPast3Months,
+  getAllRiskFactors,
+  getAllRiskFactorExtra,
+  getDangerSignCodes,
+  getLatestDangerSignsForPregnancy,
+  getNextANCVisitDate,
+  isReadyForNewPregnancy,
+  isReadyForDelivery,
+  getMostRecentLMPDateForPregnancy,
+  getMostRecentEDDForPregnancy,
+  getDeliveryDate,
+  getFormArraySubmittedInWindow,
+  getRecentANCVisitWithEvent,
+  getField,
+  getRiskFactorsFromPregnancy,
+  now,
+  addImmunizations,
+  getAgeInMonths,
+  initImmunizations,
+  isSingleDose,
+  countDosesReceived,
+  countDosesPossible,
+  countReportsSubmittedInWindow,
+  immunizationForms,
+};
diff --git a/tests/e2e/visual/contacts/config/contact-summary.templated.js b/tests/e2e/visual/contacts/config/contact-summary.templated.js
new file mode 100644
index 00000000000..c705a85d25a
--- /dev/null
+++ b/tests/e2e/visual/contacts/config/contact-summary.templated.js
@@ -0,0 +1,323 @@
+const moment = require('moment');
+const extras = require('./contact-summary-extras');
+
+const {
+  today,
+  isHighRiskPregnancy,
+  getNewestReport,
+  getSubsequentPregnancyFollowUps,
+  isAlive,
+  isReadyForNewPregnancy,
+  isReadyForDelivery,
+  isActivePregnancy,
+  countANCFacilityVisits,
+  getAllRiskFactors,
+  getLatestDangerSignsForPregnancy,
+  getNextANCVisitDate,
+  getMostRecentLMPDateForPregnancy,
+  getMostRecentEDDForPregnancy,
+  getRecentANCVisitWithEvent,
+  getAllRiskFactorExtra,
+  getField,
+  now,
+  IMMUNIZATION_LIST,
+  addImmunizations,
+  getAgeInMonths,
+  initImmunizations,
+  isSingleDose,
+  countDosesReceived,
+  countDosesPossible,
+  countReportsSubmittedInWindow,
+  immunizationForms,
+} = extras;
+
+// contact, reports, lineage are globally available for contact-summary
+// eslint-disable-next-line no-undef
+const thisContact = contact;
+// eslint-disable-next-line no-undef
+const thisLineage = lineage;
+// eslint-disable-next-line no-undef
+const allReports = reports;
+
+const context = {
+  alive: isAlive(thisContact),
+  muted: false,
+  showPregnancyForm: isReadyForNewPregnancy(thisContact, allReports),
+  showDeliveryForm: isReadyForDelivery(thisContact, allReports),
+};
+
+const fields = [
+  {
+    appliesToType: 'person',
+    label: 'patient_id',
+    value: thisContact.patient_id,
+    width: 4,
+  },
+  {
+    appliesToType: 'person',
+    label: 'contact.age',
+    value: thisContact.date_of_birth,
+    width: 4,
+    filter: 'age',
+  },
+  {
+    appliesToType: 'person',
+    label: 'contact.sex',
+    value: `contact.sex.${thisContact.sex}`,
+    translate: true,
+    width: 4,
+  },
+  {
+    appliesToType: 'person',
+    label: 'person.field.phone',
+    value: thisContact.phone,
+    width: 4,
+  },
+  {
+    appliesToType: 'person',
+    label: 'contact.parent',
+    value: thisLineage,
+    filter: 'lineage',
+  },
+  {
+    appliesToType: '!person',
+    label: 'contact',
+    value: thisContact.contact && thisContact.contact.name,
+    width: 4,
+  },
+  {
+    appliesToType: '!person',
+    label: 'contact.phone',
+    value: thisContact.contact && thisContact.contact.phone,
+    width: 4,
+  },
+  {
+    appliesToType: 'clinic',
+    label: 'Last Visited',
+    value: '36 days ago',
+    width: 4,
+  },
+  {
+    appliesToType: '!person',
+    appliesIf: function () {
+      return thisContact.parent && thisLineage[0];
+    },
+    label: 'contact.parent',
+    value: thisLineage,
+    filter: 'lineage',
+  },
+];
+
+if (thisContact.short_name) {
+  fields.unshift({
+    appliesToType: 'person',
+    label: 'contact.short_name',
+    value: thisContact.short_name,
+    width: 4,
+  });
+}
+
+const cards = [
+  {
+    label: 'contact.profile.pregnancy.active',
+    appliesToType: 'report',
+    appliesIf: function (report) {
+      return isActivePregnancy(thisContact, allReports, report);
+    },
+    fields: function (report) {
+      const fields = [];
+      const riskFactors = getAllRiskFactors(allReports, report);
+      const riskFactorsCustom = getAllRiskFactorExtra(allReports, report);
+      const dangerSigns = getLatestDangerSignsForPregnancy(allReports, report);
+      const highRisk = isHighRiskPregnancy(allReports, report);
+      const mostRecentANC = getNewestReport(allReports, ['pregnancy', 'pregnancy_home_visit']);
+      const mostRecentANCDate = moment(mostRecentANC.reported_date);
+      const lmp_date = getMostRecentLMPDateForPregnancy(allReports, report);
+      const edd_ms = getMostRecentEDDForPregnancy(allReports, report);
+      const nextAncVisitDate = getNextANCVisitDate(allReports, report);
+      const weeksPregnant = lmp_date ? today.diff(lmp_date, 'weeks') : null;
+
+      let lmp_approx = getField(report, 'lmp_approx');
+      let reportDate = report.reported_date;
+
+      getSubsequentPregnancyFollowUps(allReports, report).forEach(function (followUpReport) {
+        if (followUpReport.reported_date > reportDate && getField(followUpReport, 'lmp_updated') === 'yes') {
+          reportDate = followUpReport.reported_date;
+          if (getField(followUpReport, 'lmp_method_approx')) {
+            lmp_approx = getField(followUpReport, 'lmp_method_approx');
+          }
+        }
+      });
+
+      const migratedReport = getRecentANCVisitWithEvent(allReports, report, 'migrated');
+      const refusedReport = getRecentANCVisitWithEvent(allReports, report, 'refused');
+      const stopReport = migratedReport || refusedReport;
+
+      if (stopReport) {
+        const clearAll = getField(stopReport, 'pregnancy_ended.clear_option') === 'clear_all';
+        fields.push(
+          {
+            label: 'contact.profile.change_care',
+            value: migratedReport ? 'Migrated out of area' : 'Refusing care',
+            width: 6
+          },
+          { label: 'contact.profile.tasks_on_off', value: clearAll ? 'Off' : 'On', width: 6 }
+        );
+      }
+
+      fields.push(
+        {
+          label: 'Weeks Pregnant',
+          value: weeksPregnant !== null
+            ? { number: weeksPregnant, approximate: lmp_approx === 'yes' }
+            : 'contact.profile.value.unknown',
+          translate: weeksPregnant === null,
+          filter: weeksPregnant !== null ? 'weeksPregnant' : '',
+          width: 6
+        },
+        {
+          label: 'contact.profile.edd',
+          value: edd_ms ? edd_ms.valueOf() : 'contact.profile.value.unknown',
+          translate: !edd_ms,
+          filter: edd_ms ? 'simpleDate' : '',
+          width: 6
+        }
+      );
+
+      if (highRisk) {
+        let riskValue = '';
+        if (!riskFactors && riskFactorsCustom) {
+          riskValue = riskFactorsCustom.join(', ');
+        } else if (riskFactors.length > 1 || (riskFactors && riskFactorsCustom)) {
+          riskValue = 'contact.profile.risk.multiple';
+        } else {
+          riskValue = 'contact.profile.danger_sign.' + riskFactors[0];
+        }
+        fields.push(
+          { label: 'contact.profile.risk.high', value: riskValue, translate: true, icon: 'icon-risk', width: 6 }
+        );
+      }
+
+      if (dangerSigns.length > 0) {
+        fields.push({
+          label: 'contact.profile.danger_signs.current',
+          value: dangerSigns.length > 1
+            ? 'contact.profile.danger_sign.multiple'
+            : `contact.profile.danger_sign.${dangerSigns[0]}`,
+          translate: true,
+          width: 6
+        });
+      }
+
+      fields.push(
+        {
+          label: 'contact.profile.visit',
+          value: 'contact.profile.visits.of',
+          context: { count: countANCFacilityVisits(allReports, report), total: 8 },
+          translate: true,
+          width: 6
+        },
+        { label: 'contact.profile.last_visited', value: mostRecentANCDate.valueOf(), filter: 'relativeDay', width: 6 }
+      );
+
+      if (nextAncVisitDate && nextAncVisitDate.isSameOrAfter(today)) {
+        fields.push(
+          { label: 'contact.profile.anc.next', value: nextAncVisitDate.valueOf(), filter: 'simpleDate', width: 6 }
+        );
+      }
+
+      return fields;
+    },
+    modifyContext: function (ctx, report) {
+      let lmpDate = getField(report, 'lmp_date_8601');
+      let lmpMethodApprox = getField(report, 'lmp_method_approx');
+      let hivTested = getField(report, 'hiv_status_known');
+      let dewormingMedicationReceived = getField(report, 'deworming_med_received');
+      let ttReceived = getField(report, 'tt_received');
+      const riskFactorCodes = getAllRiskFactors(allReports, report);
+      const riskFactorsCustom = getAllRiskFactorExtra(allReports, report);
+      let pregnancyFollowupDateRecent = getField(report, 't_pregnancy_follow_up_date');
+
+      getSubsequentPregnancyFollowUps(allReports, report).forEach(function (followUpReport) {
+        if (getField(followUpReport, 'lmp_updated') === 'yes') {
+          lmpDate = getField(followUpReport, 'lmp_date_8601');
+          lmpMethodApprox = getField(followUpReport, 'lmp_method_approx');
+        }
+        hivTested = getField(followUpReport, 'hiv_status_known');
+        dewormingMedicationReceived = getField(followUpReport, 'deworming_med_received');
+        ttReceived = getField(followUpReport, 'tt_received');
+        if (getField(followUpReport, 't_pregnancy_follow_up') === 'yes') {
+          pregnancyFollowupDateRecent = getField(followUpReport, 't_pregnancy_follow_up_date');
+        }
+      });
+
+      ctx.lmp_date_8601 = lmpDate;
+      ctx.lmp_method_approx = lmpMethodApprox;
+      ctx.is_active_pregnancy = true;
+      ctx.deworming_med_received = dewormingMedicationReceived;
+      ctx.hiv_tested_past = hivTested;
+      ctx.tt_received_past = ttReceived;
+      ctx.risk_factor_codes = riskFactorCodes.join(' ');
+      ctx.risk_factor_extra = riskFactorsCustom.join('; ');
+      ctx.pregnancy_follow_up_date_recent = pregnancyFollowupDateRecent;
+      ctx.pregnancy_uuid = report._id;
+    }
+  },
+  {
+    label: 'contact.profile.immunizations',
+    appliesToType: 'person',
+    appliesIf: function() {
+      return getAgeInMonths() < 144;
+    },
+    fields: function() {
+      const immunizations = initImmunizations();
+      // eslint-disable-next-line no-undef
+      reports.forEach(function(report) {
+        if (report.form === 'immunization_visit') {
+          if (report.fields && report.fields.vaccines_received) {
+            addImmunizations(immunizations, report.fields.vaccines_received);
+          }
+        } else if (report.form === 'C_IMM') {
+          addImmunizations(immunizations, report.fields);
+        } else {
+          addImmunizations(immunizations, report.form);
+        }
+      });
+
+      const fields = IMMUNIZATION_LIST.map(function(imm) {
+        const field = {
+          label: 'contact.profile.imm.' + imm,
+          translate: true,
+          width: 6,
+        };
+        if (isSingleDose(imm)) {
+          field.value = immunizations[imm] ? 'yes' : 'no';
+        } else {
+          field.value = 'contact.profile.imm.doses';
+          field.context = {
+            count: countDosesReceived(immunizations, imm),
+            total: countDosesPossible(imm),
+          };
+        }
+        return field;
+      });
+
+      if (!fields.length) {
+        fields.push({
+          label: 'contact.profile.imm.generic',
+          translate: true,
+          value: countReportsSubmittedInWindow(immunizationForms, now),
+          width: 12,
+        });
+      }
+
+      return fields;
+    },
+  },
+];
+
+module.exports = {
+  context: context,
+  cards: cards,
+  fields: fields
+};
diff --git a/tests/e2e/visual/contacts/contact-user-hierarchy-creation.wdio-spec.js b/tests/e2e/visual/contacts/contact-user-hierarchy-creation.wdio-spec.js
new file mode 100644
index 00000000000..0ba1c7dd251
--- /dev/null
+++ b/tests/e2e/visual/contacts/contact-user-hierarchy-creation.wdio-spec.js
@@ -0,0 +1,117 @@
+
+const commonPage = require('@page-objects/default/common/common.wdio.page');
+const loginPage = require('@page-objects/default/login/login.wdio.page');
+const contactPage = require('@page-objects/default/contacts/contacts.wdio.page');
+const genericForm = require('@page-objects/default/enketo/generic-form.wdio.page');
+const commonEnketoPage = require('@page-objects/default/enketo/common-enketo.wdio.page');
+const searchPage = require('@page-objects/default/search/search.wdio.page');
+const usersAdminPage = require('@page-objects/default/users/user.wdio.page');
+
+const utils = require('@utils');
+const { generateScreenshot } = require('@utils/screenshots');
+
+describe('Creating and editing contacts and users', () => {
+  const healthFacilityName = 'Nairobi North Facility';
+
+  before(async () => {
+    await loginPage.cookieLogin();
+    await commonPage.goToPeople();
+  });
+
+  after(async () => {
+    await utils.revertDb([/^form:/], true);
+  });
+
+  afterEach(async () => {
+    await commonPage.goToPeople();
+  });
+
+  it('should create health facility, chw area and chw '+
+    'chw supervisor and chw user', async () => {
+    //create health facility
+    await generateScreenshot('new-facility', 'select-new-facility');
+    await commonPage.clickFastActionFlat({ waitForList: false });
+    await commonEnketoPage.selectRadioButton('Set the Primary Contact', 'Skip this step');
+    await generateScreenshot('new-facility', 'skip-primary-contact');
+    await genericForm.nextPage();
+    await commonEnketoPage.setInputValue('Name', healthFacilityName);
+    await generateScreenshot('new-facility', 'enter-facility-name');
+    await genericForm.submitForm({ waitForPageLoaded: false });
+    await contactPage.waitForContactLoaded();
+    await commonPage.hideSnackbar();
+    await generateScreenshot('new-facility', 'created-facility');
+
+    //create chw area and chw
+    await commonPage.clickFastActionFAB({ waitForList: false });
+    await browser.pause(150); // Waiting for animation to avoid blurry screenshots
+    await generateScreenshot('new-chw-area', 'new-chw-area');
+    await commonPage.closeFastActionList();
+    await commonPage.clickFastActionFAB({ actionId: 'health_center' });
+    await commonEnketoPage.selectRadioButton('Set the Primary Contact', 'Create a new person');
+    await commonEnketoPage.setInputValue('Full Name', 'Jane Doe');
+    await commonEnketoPage.selectRadioButton('Set the Primary Contact', 'Create a new person');
+    await generateScreenshot('new-chw-area', 'create-new-person');
+    await commonEnketoPage.setDateValue('Age', '1990-01-21');
+    await commonEnketoPage.selectRadioButton('Sex', 'Male');
+    await commonEnketoPage.scrollToQuestion('Age');
+    await generateScreenshot('new-chw-area', 'fill-required-fields');
+    await commonEnketoPage.selectRadioButton('Role', 'CHW');
+    await genericForm.nextPage();
+    await commonEnketoPage.selectRadioButton(
+      'Would you like to name the place after the primary contact:',
+      'Yes'
+    );
+    await generateScreenshot('new-chw-area', 'name-after-primary-contact');
+    await genericForm.submitForm({ waitForPageLoaded: false });
+    await contactPage.waitForContactLoaded();
+    await commonPage.hideSnackbar();
+    await generateScreenshot('new-chw-area', 'created-chw-area');
+
+    //create chw supervisor
+    await contactPage.selectLHSRowByText(healthFacilityName);
+    await searchPage.clearSearch();
+    await commonPage.clickFastActionFAB({ waitForList: false });
+    await browser.pause(150); // Waiting for animation to avoid blurry screenshots
+    await generateScreenshot('new-chw-supervisor', 'new-person');
+    await commonPage.closeFastActionList();
+    await commonPage.clickFastActionFAB({ actionId: 'person' });
+    await commonEnketoPage.setInputValue('Full name', 'John Doe');
+    await generateScreenshot('new-chw-supervisor', 'belongs-to');
+    await commonEnketoPage.selectRadioButton('Sex', 'male');
+    await commonEnketoPage.setDateValue('Age', '1988-03-07');
+    await genericForm.submitForm();
+    await contactPage.selectLHSRowByText(healthFacilityName);
+    await searchPage.clearSearch();
+    await commonPage.openMoreOptionsMenu();
+    await browser.pause(150); // Waiting for animation to avoid blurry screenshots
+    await generateScreenshot('new-chw-supervisor', 'edit-facility');
+    await commonPage.accessEditOption(true);
+    await contactPage.openPrimaryContactSearchDropdown();
+    await contactPage.inputPrimaryContactSearchValue('John');
+    await generateScreenshot('new-chw-supervisor', 'set-primary-contact');
+    await contactPage.selectPrimaryContactSearchFirstResult();
+    await contactPage.genericForm.submitForm();
+    await contactPage.selectLHSRowByText(healthFacilityName);
+    await searchPage.clearSearch();
+    await generateScreenshot('new-chw-supervisor', 'primary-contact-selected');
+
+    //create chw user
+    await commonPage.openHamburgerMenu();
+    await generateScreenshot('new-chw-user', 'app-settings');
+    await commonPage.openAppManagement();
+    await usersAdminPage.goToAdminUser();
+    await (await usersAdminPage.addUserButton()).waitForDisplayed();
+    await generateScreenshot('new-chw-user', 'add-user');
+    await usersAdminPage.openAddUserDialog();
+    await usersAdminPage.inputAddUserFields(
+      'Janet',
+      '',
+      'chw',
+      `Jane Doe's Area`,
+      'John Doe',
+      'Secret_1'
+    );
+    await usersAdminPage.scrollToRole();
+    await generateScreenshot('new-chw-user', 'fill-user-details');
+  });
+});
diff --git a/tests/e2e/visual/contacts/contact-user-management.wdio-spec.js b/tests/e2e/visual/contacts/contact-user-management.wdio-spec.js
new file mode 100644
index 00000000000..114e6fedefe
--- /dev/null
+++ b/tests/e2e/visual/contacts/contact-user-management.wdio-spec.js
@@ -0,0 +1,148 @@
+const commonPage = require('@page-objects/default/common/common.wdio.page');
+const loginPage = require('@page-objects/default/login/login.wdio.page');
+const dataFactory = require('@factories/cht/generate');
+const searchPage = require('@page-objects/default/search/search.wdio.page');
+const contactPage = require('@page-objects/default/contacts/contacts.wdio.page');
+const utils = require('@utils');
+const chtConfUtils = require('@utils/cht-conf');
+const path = require('path');
+const { generateScreenshot, isMobile } = require('@utils/screenshots');
+
+describe('Contact and User Management', () => {
+  const updateContactSummarySettings = async () => {
+    await chtConfUtils.initializeConfigDir();
+    const contactSummaryFile = path.join(__dirname, 'config/contact-summary.templated.js');
+    const contactSummaryExtrasFile = path.join(__dirname, 'config/contact-summary-extras.js');
+    const { contactSummary } = await chtConfUtils.compileNoolsConfig({
+      contactSummary: contactSummaryFile,
+      contactSummaryExtras: contactSummaryExtrasFile
+    });
+    await utils.updateSettings(
+      { contact_summary: contactSummary },
+      { revert: true, ignoreReload: true, refresh: true, sync: true }
+    );
+    await commonPage.waitForPageLoaded();
+  };
+
+  const compileAndUploadForms = async () => {
+    await chtConfUtils.initializeConfigDir();
+    const formsPath = path.join(__dirname, 'forms');
+    await chtConfUtils.compileAndUploadAppForms(formsPath);
+  };
+
+  const docs = dataFactory.createHierarchy({
+    name: 'Janet Mwangi',
+    user: true,
+    nbrClinics: 10,
+    nbrPersons: 4,
+    useRealNames: true,
+  });
+
+  before(async () => {
+    await utils.saveDocs([...docs.places, ...docs.clinics, ...docs.persons, ...docs.reports]);
+    await utils.createUsers([docs.user]);
+    await utils.addTranslations('en', {'contact.last.visit.unknown': 'Last Visited'});
+    await loginPage.login(docs.user);
+    await updateContactSummarySettings();
+  });
+
+  after(async () => {
+    await utils.deleteUsers([docs.user]);
+    await utils.revertDb([/^form:/], true);
+    await utils.revertSettings();
+  });
+
+  afterEach(async () => {
+    await commonPage.goToBase();
+  });
+
+  describe('Contact and user overview', () => {
+    it('should show contacts list, search, profiles (person and family), '+
+      'contact summary', async function() {
+      await commonPage.goToPeople();
+      expect(await commonPage.isPeopleListPresent()).to.be.true;
+      await generateScreenshot('people', 'list');
+      await searchPage.performSearch('Beatrice');
+      await generateScreenshot('people', 'search');
+      await searchPage.clearSearch();
+      await contactPage.selectLHSRowByText('Beatrice Bass Family');
+      await searchPage.clearSearch();
+      await generateScreenshot('people', 'profile-family');
+      await commonPage.goToBase();
+      await commonPage.goToPeople();
+      await contactPage.selectLHSRowByText('Beatrice Bass');
+      await generateScreenshot('people', 'profile-person');
+    });
+
+    it('should show condition cards', async function() {
+      if (!await isMobile()){
+        this.skip();
+      }
+      await commonPage.goToPeople();
+      expect(await commonPage.isPeopleListPresent()).to.be.true;
+      await contactPage.selectLHSRowByText('Beatrice Bass');
+      await (await contactPage.pregnancyCardSelectors.pregnancyCard()).scrollIntoView();
+      await generateScreenshot('people', 'condition-card-active-pregnancy');
+      await commonPage.goToBase();
+      await commonPage.goToPeople();
+      await contactPage.selectLHSRowByText('John Bass');
+      await (await contactPage.inmunizationCardSelectors.inmunizationCard()).scrollIntoView();
+      await generateScreenshot('people', 'condition-card-inmunization');
+    });
+
+    it('should show profiles (area and branch)', async function() {
+      if (!await isMobile()){
+        this.skip();
+      }
+      await commonPage.logout();
+      await loginPage.cookieLogin();
+      await commonPage.goToPeople();
+      expect(await commonPage.isPeopleListPresent()).to.be.true;
+      await contactPage.selectLHSRowByText(`Janet Mwangi's Area`);
+      await generateScreenshot('people', 'profile-area');
+      await commonPage.goToBase();
+      await commonPage.goToPeople();
+      await contactPage.selectLHSRowByText(`Kiambu Branch`);
+      await generateScreenshot('people', 'profile-branch');
+      await commonPage.goToBase();
+      await commonPage.logout();
+      await loginPage.login(docs.user);
+    });
+
+    it('should show UHC sort', async function() {
+      if (!await isMobile()){
+        this.skip();
+      }
+      await utils.updatePermissions(docs.user.roles, ['can_view_uhc_stats', 'can_view_last_visited_date'], [], {
+        ignoreReload: true,
+        revert: true,
+        refresh: true,
+        sync: true
+      });
+      await commonPage.waitForPageLoaded();
+      await commonPage.goToPeople();
+      await contactPage.selectSortOrder('By date last visited');
+      await contactPage.openSortMenu();
+      await generateScreenshot('people', 'sort');
+    });
+
+    it('should show cares guides', async function() {
+      if (!await isMobile()){
+        this.skip();
+      }
+      await compileAndUploadForms();
+      await utils.updatePermissions(docs.user.roles, [], ['can_view_call_action', 'can_view_message_action'], {
+        ignoreReload: true,
+        revert: true,
+        refresh: true,
+        sync: true
+      });
+      await commonPage.waitForPageLoaded();
+      await commonPage.goToPeople();
+      expect(await commonPage.isPeopleListPresent()).to.be.true;
+      await contactPage.selectLHSRowByText('Dana Dearborn');
+      await commonPage.clickFastActionFAB({ waitForList: false });
+      await generateScreenshot('people', 'care-guides');
+    });
+  });
+});
diff --git a/tests/e2e/visual/contacts/forms/death_report.properties.json b/tests/e2e/visual/contacts/forms/death_report.properties.json
new file mode 100644
index 00000000000..097afebe7be
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/death_report.properties.json
@@ -0,0 +1,9 @@
+{
+    "icon": "icon-death-general",
+    "title": "Death report",
+    "context": {
+        "person": false,
+        "place": false,
+        "expression": "contact.type === 'person' && summary.alive && !summary.show_delivery_form && user.parent.type === 'health_center' && (!contact.sex || contact.sex === 'female') && (!contact.date_of_birth || (ageInYears(contact) >= 12 && ageInYears(contact) <= 49)) && user._id != contact._id"
+    }
+}
diff --git a/tests/e2e/visual/contacts/forms/death_report.xml b/tests/e2e/visual/contacts/forms/death_report.xml
new file mode 100644
index 00000000000..a156627ad94
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/death_report.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+  <h:head>
+    <h:title>Death report</h:title>
+    <model>
+      <itext>
+        <translation lang="en">
+          <text id="/death_report/death_details/date_of_death:jr:constraintMsg">
+            <value>Date of death can only be from today up to 1 year ago.</value>
+          </text>
+          <text id="/death_report/death_details/date_of_death:label">
+            <value>Date of Death</value>
+          </text>
+          <text id="/death_report/death_details/death_information:label">
+            <value>Provide any relevant information related to the death of <output value=" /death_report/patient_display_name "/>.</value>
+          </text>
+          <text id="/death_report/death_details/place_of_death:label">
+            <value>Place of death</value>
+          </text>
+          <text id="/death_report/death_details/place_of_death_other:label">
+            <value>Specify other</value>
+          </text>
+          <text id="/death_report/death_details:label">
+            <value>Death details</value>
+          </text>
+          <text id="/death_report/group_review/r_death_info:label">
+            <value>&lt;div style=&quot;text-align:center;&quot;&gt;Relevant Information: <output value=" /death_report/death_details/death_information "/>&lt;/div&gt;</value>
+          </text>
+          <text id="/death_report/group_review/r_key_instruction:label">
+            <value>&lt;b&gt;Important Information&lt;/b&gt;&lt;i class="fa fa-warning"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/death_report/group_review/r_patient_details:label">
+            <value>&lt;div style=&quot;text-align:center;&quot;&gt;<output value=" /death_report/patient_display_name "/>
+<output value=" /death_report/group_review/c_patient_age "/>
+Date of Death: <output value=" /death_report/death_details/date_of_death "/>&lt;/div&gt;</value>
+          </text>
+          <text id="/death_report/group_review/r_referral:label">
+            <value>&lt;b&gt;You will never be able to do any follow ups on <output value=" /death_report/patient_display_name "/> when you submit this death report.&lt;/b&gt;</value>
+          </text>
+          <text id="/death_report/group_review/r_summary_details:label">
+            <value>Patient Details&lt;I class="fa fa-user"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/death_report/group_review/r_undo:label">
+            <value>You will be able to undo this death report later, if needed.</value>
+          </text>
+          <text id="/death_report/group_review/submit:label">
+            <value>&lt;h4 style="text-align:center;"&gt;To finish, be sure to click the Submit button.&lt;/h4&gt;</value>
+          </text>
+          <text id="/death_report/inputs/contact/_id:label">
+            <value>What is the patient's name?</value>
+          </text>
+          <text id="/death_report/inputs/contact/date_of_birth:label">
+            <value>Date of Birth</value>
+          </text>
+          <text id="/death_report/inputs/contact/name:label">
+            <value>Name</value>
+          </text>
+          <text id="/death_report/inputs/contact/parent/_id:label">
+            <value>Household ID</value>
+          </text>
+          <text id="/death_report/inputs/contact/parent/parent/contact/name:label">
+            <value>CHW name</value>
+          </text>
+          <text id="/death_report/inputs/contact/parent/parent/contact/phone:label">
+            <value>CHW phone</value>
+          </text>
+          <text id="/death_report/inputs/contact/parent/parent/contact:label">
+            <value>Contact</value>
+          </text>
+          <text id="/death_report/inputs/contact/patient_id:label">
+            <value>Patient ID</value>
+          </text>
+          <text id="/death_report/inputs/contact/sex:label">
+            <value>Sex</value>
+          </text>
+          <text id="/death_report/inputs/contact/short_name:label">
+            <value>Short Name</value>
+          </text>
+          <text id="/death_report/inputs/contact:label">
+            <value>Contact</value>
+          </text>
+          <text id="/death_report/inputs/source:label">
+            <value>Source</value>
+          </text>
+          <text id="/death_report/inputs/source_id:label">
+            <value>Source ID</value>
+          </text>
+        </translation>
+      </itext>
+      <instance>
+        <death_report id="death_report" prefix="J1!death_report!" delimiter="#" version="2022-09-26 12:09:48">
+          <inputs>
+            <meta>
+              <location>
+                <lat/>
+                <long/>
+                <error/>
+                <message/>
+              </location>
+            </meta>
+            <source>user</source>
+            <source_id/>
+            <contact>
+              <_id/>
+              <name/>
+              <short_name/>
+              <patient_id/>
+              <date_of_birth>0</date_of_birth>
+              <sex/>
+              <parent>
+                <_id/>
+                <parent>
+                  <contact>
+                    <name/>
+                    <phone/>
+                  </contact>
+                </parent>
+              </parent>
+            </contact>
+          </inputs>
+          <patient_age_in_years tag="hidden">0</patient_age_in_years>
+          <patient_age_in_months tag="hidden">0</patient_age_in_months>
+          <patient_age_in_days tag="hidden"/>
+          <patient_uuid tag="hidden"/>
+          <patient_id tag="hidden"/>
+          <patient_name tag="hidden"/>
+          <patient_short_name tag="hidden"/>
+          <patient_display_name tag="hidden"/>
+          <death_details>
+            <date_of_death/>
+            <place_of_death/>
+            <place_of_death_other/>
+            <death_information/>
+          </death_details>
+          <group_review tag="hidden">
+            <submit/>
+            <r_summary_details/>
+            <c_patient_age/>
+            <r_patient_details/>
+            <r_death_info/>
+            <r_key_instruction/>
+            <blank_note/>
+            <r_referral/>
+            <r_undo/>
+          </group_review>
+          <data tag="hidden">
+            <__date_of_death/>
+            <__place_of_death/>
+            <__place_of_death_other/>
+            <__death_information/>
+            <meta tag="hidden">
+              <__patient_uuid/>
+              <__patient_id/>
+              <__household_uuid/>
+              <__source/>
+              <__source_id/>
+            </meta>
+          </data>
+          <meta tag="hidden">
+            <instanceID/>
+          </meta>
+        </death_report>
+      </instance>
+      <instance id="contact-summary"/>
+      <bind nodeset="/death_report/inputs" relevant="./source = 'user'"/>
+      <bind nodeset="/death_report/inputs/source" type="string"/>
+      <bind nodeset="/death_report/inputs/source_id" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/_id" type="db:person"/>
+      <bind nodeset="/death_report/inputs/contact/name" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/short_name" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/patient_id" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/date_of_birth" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/sex" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/parent/_id" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/parent/parent/contact/name" type="string"/>
+      <bind nodeset="/death_report/inputs/contact/parent/parent/contact/phone" type="string"/>
+      <bind nodeset="/death_report/patient_age_in_years" type="string" calculate="floor( difference-in-months(  /death_report/inputs/contact/date_of_birth , today() ) div 12 )"/>
+      <bind nodeset="/death_report/patient_age_in_months" type="string" calculate="difference-in-months(  /death_report/inputs/contact/date_of_birth , today() )"/>
+      <bind nodeset="/death_report/patient_age_in_days" type="string" calculate="floor(decimal-date-time(today()) - decimal-date-time( /death_report/inputs/contact/date_of_birth ) )"/>
+      <bind nodeset="/death_report/patient_uuid" type="string" calculate="../inputs/contact/_id"/>
+      <bind nodeset="/death_report/patient_id" type="string" calculate="../inputs/contact/patient_id"/>
+      <bind nodeset="/death_report/patient_name" type="string" calculate="../inputs/contact/name"/>
+      <bind nodeset="/death_report/patient_short_name" type="string" calculate="../inputs/contact/short_name"/>
+      <bind nodeset="/death_report/patient_display_name" type="string" calculate="if(../patient_short_name = '', ../patient_name, concat(../patient_name, ' (', ../patient_short_name, ')'))"/>
+      <bind nodeset="/death_report/death_details/date_of_death" type="date" required="true()" constraint="(. &lt;= now()) and floor(decimal-date-time(today()) - decimal-date-time(.)) &lt;= 365" jr:constraintMsg="jr:itext('/death_report/death_details/date_of_death:jr:constraintMsg')"/>
+      <bind nodeset="/death_report/death_details/place_of_death" type="select1" required="true()"/>
+      <bind nodeset="/death_report/death_details/place_of_death_other" type="string" required="true()" relevant="selected(../place_of_death, 'other')"/>
+      <bind nodeset="/death_report/death_details/death_information" type="string"/>
+      <bind nodeset="/death_report/group_review/submit" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/r_summary_details" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/c_patient_age" type="string" calculate="if(../../patient_age_in_days &lt; 31, 
+concat(../../patient_age_in_days, ' days old'),
+if(../../patient_age_in_months &lt; 12, 
+concat(../../patient_age_in_months, ' months old'), 
+concat(../../patient_age_in_years, ' years old')))"/>
+      <bind nodeset="/death_report/group_review/r_patient_details" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/r_death_info" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/r_key_instruction" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/blank_note" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/r_referral" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/group_review/r_undo" readonly="true()" type="string"/>
+      <bind nodeset="/death_report/data/__date_of_death" type="string" calculate=" /death_report/death_details/date_of_death "/>
+      <bind nodeset="/death_report/data/__place_of_death" type="string" calculate=" /death_report/death_details/place_of_death "/>
+      <bind nodeset="/death_report/data/__place_of_death_other" type="string" calculate=" /death_report/death_details/place_of_death_other "/>
+      <bind nodeset="/death_report/data/__death_information" type="string" calculate=" /death_report/death_details/death_information "/>
+      <bind nodeset="/death_report/data/meta/__patient_uuid" type="string" calculate="../../../inputs/contact/_id"/>
+      <bind nodeset="/death_report/data/meta/__patient_id" type="string" calculate="../../../inputs/contact/patient_id"/>
+      <bind nodeset="/death_report/data/meta/__household_uuid" type="string" calculate="../../../inputs/contact/parent/_id"/>
+      <bind nodeset="/death_report/data/meta/__source" type="string" calculate="../../../inputs/source"/>
+      <bind nodeset="/death_report/data/meta/__source_id" type="string" calculate="../../../inputs/source_id"/>
+      <bind nodeset="/death_report/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+    </model>
+  </h:head>
+  <h:body class="pages">
+    <group appearance="field-list" ref="/death_report/inputs">
+      <group ref="/death_report/inputs/contact">
+        <label ref="jr:itext('/death_report/inputs/contact:label')"/>
+        <input appearance="db-object" ref="/death_report/inputs/contact/_id">
+          <label ref="jr:itext('/death_report/inputs/contact/_id:label')"/>
+        </input>
+        <group ref="/death_report/inputs/contact/parent">
+          <group ref="/death_report/inputs/contact/parent/parent">
+            <group ref="/death_report/inputs/contact/parent/parent/contact">
+              <label ref="jr:itext('/death_report/inputs/contact/parent/parent/contact:label')"/>
+            </group>
+          </group>
+        </group>
+      </group>
+    </group>
+    <group appearance="field-list" ref="/death_report/death_details">
+      <label ref="jr:itext('/death_report/death_details:label')"/>
+      <input ref="/death_report/death_details/date_of_death">
+        <label ref="jr:itext('/death_report/death_details/date_of_death:label')"/>
+      </input>
+      <select1 ref="/death_report/death_details/place_of_death">
+        <label ref="jr:itext('/death_report/death_details/place_of_death:label')"/>
+        <item>
+          <label>Health facility</label>
+          <value>health_facility</value>
+        </item>
+        <item>
+          <label>Home</label>
+          <value>home</value>
+        </item>
+        <item>
+          <label>Other</label>
+          <value>other</value>
+        </item>
+      </select1>
+      <input ref="/death_report/death_details/place_of_death_other">
+        <label ref="jr:itext('/death_report/death_details/place_of_death_other:label')"/>
+      </input>
+      <input appearance="multiline" ref="/death_report/death_details/death_information">
+        <label ref="jr:itext('/death_report/death_details/death_information:label')"/>
+      </input>
+    </group>
+    <group appearance="field-list summary" ref="/death_report/group_review">
+      <input ref="/death_report/group_review/submit">
+        <label ref="jr:itext('/death_report/group_review/submit:label')"/>
+      </input>
+      <input appearance="h1 yellow" ref="/death_report/group_review/r_summary_details">
+        <label ref="jr:itext('/death_report/group_review/r_summary_details:label')"/>
+      </input>
+      <input ref="/death_report/group_review/r_patient_details">
+        <label ref="jr:itext('/death_report/group_review/r_patient_details:label')"/>
+      </input>
+      <input ref="/death_report/group_review/r_death_info">
+        <label ref="jr:itext('/death_report/group_review/r_death_info:label')"/>
+      </input>
+      <input appearance="h1 blue" ref="/death_report/group_review/r_key_instruction">
+        <label ref="jr:itext('/death_report/group_review/r_key_instruction:label')"/>
+      </input>
+      <input ref="/death_report/group_review/blank_note"/>
+      <input appearance="h1 red" ref="/death_report/group_review/r_referral">
+        <label ref="jr:itext('/death_report/group_review/r_referral:label')"/>
+      </input>
+      <input ref="/death_report/group_review/r_undo">
+        <label ref="jr:itext('/death_report/group_review/r_undo:label')"/>
+      </input>
+    </group>
+    <group appearance="hidden" ref="/death_report/data">
+      <group ref="/death_report/data/meta"/>
+    </group>
+  </h:body>
+</h:html>
diff --git a/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.properties.json b/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.properties.json
new file mode 100644
index 00000000000..66449fc0494
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.properties.json
@@ -0,0 +1,9 @@
+{
+    "icon": "icon-pregnancy-danger",
+    "title": "Pregnancy danger sign",
+    "context": {
+        "person": false,
+        "place": false,
+        "expression": "contact.type === 'person' && summary.alive && !summary.muted && summary.is_active_pregnancy && user.parent.type === 'health_center' && (!contact.sex || contact.sex === 'female') && (!contact.date_of_birth || (ageInYears(contact) >= 12 && ageInYears(contact) <= 49)) && user._id != contact._id"
+    }
+}
diff --git a/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.xml b/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.xml
new file mode 100644
index 00000000000..77e55b1d6d2
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/pregnancy_danger_sign.xml
@@ -0,0 +1,518 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+  <h:head>
+    <h:title>Pregnancy danger sign</h:title>
+    <model>
+      <itext>
+        <translation lang="en">
+          <text id="/pregnancy_danger_sign/danger_signs/breaking_water/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/breaking_water/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/breaking_water:label">
+            <value>Breaking of water</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/breathlessness/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/breathlessness/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/breathlessness:label">
+            <value>Breathlessness</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/congratulate_no_ds_note:label">
+            <value>Great news! Please closely monitor her until her next scheduled pregnancy visit.</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator/woman:label">
+            <value>the woman</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator/woman-start:label">
+            <value>The woman</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/danger_signs_note:label">
+            <value>Ask <output value=" /pregnancy_danger_sign/patient_short_name "/> to monitor these danger signs throughout the pregnancy.</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/danger_signs_question_note:label">
+            <value>Does <output value=" /pregnancy_danger_sign/patient_short_name "/> currently have any of these danger signs?</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/easily_tired/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/easily_tired/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/easily_tired:label">
+            <value>Getting tired easily</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/face_hand_swelling/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/face_hand_swelling/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/face_hand_swelling:label">
+            <value>Swelling of face and hands</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fever/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fever/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fever:label">
+            <value>Fever</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fits/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fits/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/fits:label">
+            <value>Fits</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements:label">
+            <value>Reduced or no fetal movements</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/refer_patient_note_1:label">
+            <value>&lt;span style="color:red"&gt;Please refer to the health facility immediately. Accompany her if possible.&lt;/span&gt;</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/refer_patient_note_2:label">
+            <value>&lt;span style="color:red"&gt;Please complete the follow-up task within 3 days.&lt;/span&gt;</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_abdominal_pain/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_abdominal_pain/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_abdominal_pain:label">
+            <value>Severe abdominal pain</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_headache/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_headache/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/severe_headache:label">
+            <value>Severe headache</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/vaginal_bleeding/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/vaginal_bleeding/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/vaginal_bleeding:label">
+            <value>Vaginal bleeding</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/very_pale/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/very_pale/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs/very_pale:label">
+            <value>Very pale</value>
+          </text>
+          <text id="/pregnancy_danger_sign/danger_signs:label">
+            <value>Danger Sign Check</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/_id:label">
+            <value>What is the patient's name?</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/date_of_birth:label">
+            <value>Date of Birth</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/name:label">
+            <value>Name</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/parent/_id:label">
+            <value>Parent ID</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/parent/parent/contact/chw_name:label">
+            <value>CHW name</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/parent/parent/contact/phone:label">
+            <value>CHW phone</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/patient_id:label">
+            <value>Patient ID</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/sex:label">
+            <value>Sex</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact/short_name:label">
+            <value>Short Name</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/contact:label">
+            <value>Contact</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/source:label">
+            <value>Source</value>
+          </text>
+          <text id="/pregnancy_danger_sign/inputs/source_id:label">
+            <value>Source ID</value>
+          </text>
+        </translation>
+      </itext>
+      <instance>
+        <pregnancy_danger_sign id="pregnancy_danger_sign" prefix="J1!pregnancy_danger_sign!" delimiter="#" version="2022-09-26 11:20:33">
+          <inputs>
+            <meta>
+              <location>
+                <lat/>
+                <long/>
+                <error/>
+                <message/>
+              </location>
+            </meta>
+            <source>user</source>
+            <source_id/>
+            <contact>
+              <_id/>
+              <name/>
+              <short_name/>
+              <patient_id/>
+              <date_of_birth>0</date_of_birth>
+              <sex/>
+              <parent>
+                <_id/>
+                <parent>
+                  <contact>
+                    <chw_name/>
+                    <phone/>
+                  </contact>
+                </parent>
+              </parent>
+            </contact>
+          </inputs>
+          <patient_age_in_years tag="hidden"/>
+          <patient_uuid tag="hidden"/>
+          <patient_id tag="hidden"/>
+          <patient_name tag="hidden"/>
+          <patient_short_name tag="hidden"/>
+          <patient_short_name_start tag="hidden"/>
+          <t_danger_signs_referral_follow_up_date tag="hidden"/>
+          <t_danger_signs_referral_follow_up tag="hidden"/>
+          <pregnancy_uuid_ctx/>
+          <danger_signs>
+            <danger_signs_note tag="hidden"/>
+            <danger_signs_question_note tag="hidden"/>
+            <vaginal_bleeding/>
+            <fits/>
+            <severe_abdominal_pain/>
+            <severe_headache/>
+            <very_pale/>
+            <fever/>
+            <reduced_or_no_fetal_movements/>
+            <breaking_water/>
+            <easily_tired/>
+            <face_hand_swelling/>
+            <breathlessness/>
+            <r_danger_sign_present tag="hidden"/>
+            <congratulate_no_ds_note tag="hidden"/>
+            <refer_patient_note_1 tag="hidden"/>
+            <refer_patient_note_2 tag="hidden"/>
+            <custom_translations tag="hidden">
+              <custom_woman_label_translator/>
+              <custom_woman_label/>
+              <custom_woman_start_label_translator/>
+              <custom_woman_start_label/>
+            </custom_translations>
+          </danger_signs>
+          <data tag="hidden">
+            <__vaginal_bleeding/>
+            <__fits/>
+            <__severe_abdominal_pain/>
+            <__severe_headache/>
+            <__very_pale/>
+            <__fever/>
+            <__reduced_or_no_fetal_movements/>
+            <__breaking_water/>
+            <__easily_tired/>
+            <__face_hand_swelling/>
+            <__breathlessness/>
+            <__has_danger_sign/>
+            <meta tag="hidden">
+              <__patient_uuid/>
+              <__patient_id/>
+              <__household_uuid/>
+              <__source/>
+              <__source_id/>
+              <__pregnancy_uuid/>
+            </meta>
+          </data>
+          <meta tag="hidden">
+            <instanceID/>
+          </meta>
+        </pregnancy_danger_sign>
+      </instance>
+      <instance id="contact-summary"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs" relevant="./source = 'user'"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/source" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/source_id" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/_id" type="db:person"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/name" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/short_name" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/patient_id" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/date_of_birth" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/sex" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/parent/_id" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/parent/parent/contact/chw_name" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/inputs/contact/parent/parent/contact/phone" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_age_in_years" type="string" calculate="floor( difference-in-months( ../inputs/contact/date_of_birth, today() ) div 12 )"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_uuid" type="string" calculate="../inputs/contact/_id"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_id" type="string" calculate="../inputs/contact/patient_id"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_name" type="string" calculate="../inputs/contact/name"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_label)"/>
+      <bind nodeset="/pregnancy_danger_sign/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_start_label)"/>
+      <bind nodeset="/pregnancy_danger_sign/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
+      <bind nodeset="/pregnancy_danger_sign/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
+      <bind nodeset="/pregnancy_danger_sign/pregnancy_uuid_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_uuid != '', instance('contact-summary')/context/pregnancy_uuid, .)"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/danger_signs_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/danger_signs_question_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/vaginal_bleeding" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/fits" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/severe_abdominal_pain" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/severe_headache" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/very_pale" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/fever" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/breaking_water" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/easily_tired" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/face_hand_swelling" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/breathlessness" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/r_danger_sign_present" type="string" calculate="if(selected(../vaginal_bleeding, 'yes')
+or selected(../fits, 'yes')
+or selected(../severe_abdominal_pain, 'yes')
+or selected(../severe_headache, 'yes')
+or selected(../very_pale, 'yes')
+or selected(../fever, 'yes')
+or selected(../reduced_or_no_fetal_movements, 'yes')
+or selected(../breaking_water, 'yes')
+or selected(../easily_tired, 'yes')
+or selected(../face_hand_swelling, 'yes')
+or selected(../breathlessness, 'yes'), 
+'yes',
+if(selected(../vaginal_bleeding, 'no')
+and selected(../fits, 'no')
+and selected(../severe_abdominal_pain, 'no')
+and selected(../severe_headache, 'no')
+and selected(../very_pale, 'no')
+and selected(../fever, 'no')
+and selected(../reduced_or_no_fetal_movements, 'no')
+and selected(../breaking_water, 'no')
+and selected(../easily_tired, 'no')
+and selected(../face_hand_swelling, 'no')
+and selected(../breathlessness, 'no'), 'no', ''))"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/congratulate_no_ds_note" readonly="true()" type="string" relevant="../r_danger_sign_present = 'no'"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/refer_patient_note_1" readonly="true()" type="string" relevant="../r_danger_sign_present = 'yes'"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/refer_patient_note_2" readonly="true()" type="string" relevant="../r_danger_sign_present = 'yes'"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator" type="select1" calculate="&quot;woman&quot;"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label" type="string" calculate="jr:choice-name( /pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator ,' /pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator ')"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator" type="select1" calculate="&quot;woman-start&quot;"/>
+      <bind nodeset="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label" type="string" calculate="jr:choice-name( /pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator ,' /pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator ')"/>
+      <bind nodeset="/pregnancy_danger_sign/data/__vaginal_bleeding" type="string" calculate=" /pregnancy_danger_sign/danger_signs/vaginal_bleeding "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__fits" type="string" calculate=" /pregnancy_danger_sign/danger_signs/fits "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__severe_abdominal_pain" type="string" calculate=" /pregnancy_danger_sign/danger_signs/severe_abdominal_pain "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__severe_headache" type="string" calculate=" /pregnancy_danger_sign/danger_signs/severe_headache "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__very_pale" type="string" calculate=" /pregnancy_danger_sign/danger_signs/very_pale "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__fever" type="string" calculate=" /pregnancy_danger_sign/danger_signs/fever "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__reduced_or_no_fetal_movements" type="string" calculate=" /pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__breaking_water" type="string" calculate=" /pregnancy_danger_sign/danger_signs/breaking_water "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__easily_tired" type="string" calculate=" /pregnancy_danger_sign/danger_signs/easily_tired "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__face_hand_swelling" type="string" calculate=" /pregnancy_danger_sign/danger_signs/face_hand_swelling "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__breathlessness" type="string" calculate=" /pregnancy_danger_sign/danger_signs/breathlessness "/>
+      <bind nodeset="/pregnancy_danger_sign/data/__has_danger_sign" type="string" calculate=" /pregnancy_danger_sign/danger_signs/r_danger_sign_present "/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__patient_uuid" type="string" calculate="../../../inputs/contact/_id"/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__patient_id" type="string" calculate="../../../inputs/contact/patient_id"/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__household_uuid" type="string" calculate="../../../inputs/contact/parent/_id"/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__source" type="string" calculate="../../../inputs/source"/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__source_id" type="string" calculate="../../../inputs/source_id"/>
+      <bind nodeset="/pregnancy_danger_sign/data/meta/__pregnancy_uuid" type="string" calculate=" /pregnancy_danger_sign/pregnancy_uuid_ctx "/>
+      <bind nodeset="/pregnancy_danger_sign/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+    </model>
+  </h:head>
+  <h:body class="pages">
+    <group appearance="field-list" ref="/pregnancy_danger_sign/inputs">
+      <group ref="/pregnancy_danger_sign/inputs/contact">
+        <label ref="jr:itext('/pregnancy_danger_sign/inputs/contact:label')"/>
+        <input appearance="db-object" ref="/pregnancy_danger_sign/inputs/contact/_id">
+          <label ref="jr:itext('/pregnancy_danger_sign/inputs/contact/_id:label')"/>
+        </input>
+        <group ref="/pregnancy_danger_sign/inputs/contact/parent">
+          <group ref="/pregnancy_danger_sign/inputs/contact/parent/parent">
+            <group ref="/pregnancy_danger_sign/inputs/contact/parent/parent/contact"/>
+          </group>
+        </group>
+      </group>
+    </group>
+    <group appearance="field-list" ref="/pregnancy_danger_sign/danger_signs">
+      <label ref="jr:itext('/pregnancy_danger_sign/danger_signs:label')"/>
+      <input ref="/pregnancy_danger_sign/danger_signs/danger_signs_note">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/danger_signs_note:label')"/>
+      </input>
+      <input ref="/pregnancy_danger_sign/danger_signs/danger_signs_question_note">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/danger_signs_question_note:label')"/>
+      </input>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/vaginal_bleeding">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/vaginal_bleeding:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/vaginal_bleeding/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/vaginal_bleeding/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/fits">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fits:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fits/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fits/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/severe_abdominal_pain">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_abdominal_pain:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_abdominal_pain/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_abdominal_pain/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/severe_headache">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_headache:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_headache/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/severe_headache/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/very_pale">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/very_pale:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/very_pale/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/very_pale/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/fever">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fever:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fever/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/fever/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/reduced_or_no_fetal_movements/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/breaking_water">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breaking_water:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breaking_water/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breaking_water/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/easily_tired">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/easily_tired:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/easily_tired/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/easily_tired/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/face_hand_swelling">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/face_hand_swelling:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/face_hand_swelling/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/face_hand_swelling/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_danger_sign/danger_signs/breathlessness">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breathlessness:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breathlessness/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/breathlessness/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <input ref="/pregnancy_danger_sign/danger_signs/congratulate_no_ds_note">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/congratulate_no_ds_note:label')"/>
+      </input>
+      <input ref="/pregnancy_danger_sign/danger_signs/refer_patient_note_1">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/refer_patient_note_1:label')"/>
+      </input>
+      <input ref="/pregnancy_danger_sign/danger_signs/refer_patient_note_2">
+        <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/refer_patient_note_2:label')"/>
+      </input>
+      <group appearance="hidden" ref="/pregnancy_danger_sign/danger_signs/custom_translations">
+        <select1 ref="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator">
+          <item>
+            <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_label_translator/woman:label')"/>
+            <value>woman</value>
+          </item>
+        </select1>
+        <select1 ref="/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator">
+          <item>
+            <label ref="jr:itext('/pregnancy_danger_sign/danger_signs/custom_translations/custom_woman_start_label_translator/woman-start:label')"/>
+            <value>woman-start</value>
+          </item>
+        </select1>
+      </group>
+    </group>
+    <group appearance="hidden" ref="/pregnancy_danger_sign/data">
+      <group ref="/pregnancy_danger_sign/data/meta"/>
+    </group>
+  </h:body>
+</h:html>
diff --git a/tests/e2e/visual/contacts/forms/pregnancy_home_visit.properties.json b/tests/e2e/visual/contacts/forms/pregnancy_home_visit.properties.json
new file mode 100644
index 00000000000..0f4033b8a6d
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/pregnancy_home_visit.properties.json
@@ -0,0 +1,9 @@
+{
+    "icon": "icon-pregnancy",
+    "title": "ANC visit",
+    "context": {
+        "person": true,
+        "place": false,
+        "expression": "contact.type === 'person' && summary.alive && !summary.muted && summary.is_active_pregnancy && user.parent.type === 'health_center' && (!contact.sex || contact.sex === 'female') && (!contact.date_of_birth || (ageInYears(contact) >= 12 && ageInYears(contact) <= 49)) && user._id != contact._id"
+    }
+}
diff --git a/tests/e2e/visual/contacts/forms/pregnancy_home_visit.xml b/tests/e2e/visual/contacts/forms/pregnancy_home_visit.xml
new file mode 100644
index 00000000000..eb7bcac4f04
--- /dev/null
+++ b/tests/e2e/visual/contacts/forms/pregnancy_home_visit.xml
@@ -0,0 +1,2247 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
+  <h:head>
+    <h:title>Pregnancy home visit</h:title>
+    <model>
+      <itext>
+        <translation lang="en">
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg">
+            <value>Date cannot be in the past. Date cannot be more than one month from today.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known/no:label">
+            <value>I don't know</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known/yes:label">
+            <value>Enter date</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known:label">
+            <value>If <output value=" /pregnancy_home_visit/patient_short_name "/> has a specific upcoming ANC appointment date, enter it here. You will receive a task three days before to remind her to attend.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note:label">
+            <value><output value=" /pregnancy_home_visit/patient_short_name_start "/> is **<output value=" /pregnancy_home_visit/weeks_since_lmp_rounded "/> weeks** pregnant.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/refer_note:label">
+            <value>Please refer <output value=" /pregnancy_home_visit/patient_short_name "/> to the health facility at the appropriate time.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note:label">
+            <value>The WHO recommends ANC visits at 12, 20, 26, 30, 34, 36, 38, 40 weeks.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next:label">
+            <value>ANC Visits at Health Facility (Upcoming)</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended:label">
+            <value>Did the woman complete the health facility ANC visit scheduled for <output value=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/pregnancy_follow_up_date_recent "/>?</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits:label">
+            <value>Would you like to report any additional unreported health facility ANC visits?</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single/no:label">
+            <value>I don't know</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single/yes:label">
+            <value>Enter date</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single:label">
+            <value>Please enter the date if you know it.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:jr:constraintMsg">
+            <value>Enter the correct date. Date must be within this pregnancy and cannot be in the future!</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:label">
+            <value>Date</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:jr:constraintMsg">
+            <value>Enter the correct date. Date must be within this pregnancy and cannot be in the future!</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:label">
+            <value>Date</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple/no:label">
+            <value>I don't know</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple/yes:label">
+            <value>Enter date</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple:label">
+            <value>Visit</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note:label">
+            <value>Please enter the dates if you have them.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note_section:label">
+            <value>Each "Visit" section below asks about one individual visit. Please complete all sections.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:hint">
+            <value>Enter 0 if she has not been yet.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:jr:constraintMsg">
+            <value>Must be an integer between 0 and 9.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:label">
+            <value>How many?</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past:label">
+            <value>ANC Visits at Health Facility (Past)</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk:jr:constraintMsg">
+            <value>max characters = 100</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk:label">
+            <value>If yes, please describe.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check:label">
+            <value>Are there additional factors that could make this pregnancy high-risk?</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/asthma_note:label">
+            <value>Asthma</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/diabetes_note:label">
+            <value>Diabetes</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/extra_risk_note:label">
+            <value><output value=" /pregnancy_home_visit/context_vars/risk_factor_extra_ctx "/></value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/first_pregnancy_note:label">
+            <value>First pregnancy</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/heart_condition_note:label">
+            <value>Heart condition</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/high_blood_pressure_note:label">
+            <value>High blood pressure</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/last_baby_born_less_than_1_year_ago_note:label">
+            <value>Last baby born less than one year ago</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/more_than_4_children_note:label">
+            <value>Has delivered four or more children</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:hint">
+            <value>Select all that apply.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:jr:constraintMsg">
+            <value>If "None of the above" selected, cannot select any other option.</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:label">
+            <value>Does <output value=" /pregnancy_home_visit/patient_short_name "/> have additional risk factors that you have not previously reported?</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/no_previous_risks_note:label">
+            <value>None</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_difficulties_note:label">
+            <value>Previous difficulties in childbirth</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_miscarriage_note:label">
+            <value>Previous miscarriages or stillbirths</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_risk_factors_note:label">
+            <value>You previously reported the following risk factors:</value>
+          </text>
+          <text id="/pregnancy_home_visit/anc_visits_hf/risk_factors:label">
+            <value>Risk Factors</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breaking_water/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breaking_water/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breaking_water:label">
+            <value>Breaking of water</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breathlessness/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breathlessness/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/breathlessness:label">
+            <value>Breathlessness</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/congratulate_no_ds_note:label">
+            <value>Great news! Please closely monitor her until her next scheduled pregnancy visit.</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/danger_signs_note:label">
+            <value>Ask <output value=" /pregnancy_home_visit/patient_short_name "/> to monitor these danger signs throughout the pregnancy.</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/danger_signs_question_note:label">
+            <value>Does <output value=" /pregnancy_home_visit/patient_short_name "/> currently have any of these danger signs?</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/easily_tired/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/easily_tired/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/easily_tired:label">
+            <value>Getting tired easily</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/face_hand_swelling/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/face_hand_swelling/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/face_hand_swelling:label">
+            <value>Swelling of face and hands</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fever/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fever/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fever:label">
+            <value>Fever</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fits/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fits/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/fits:label">
+            <value>Fits</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements:label">
+            <value>Reduced or no fetal movements</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/refer_patient_note_1:label">
+            <value>&lt;span style="color:red"&gt;Please refer to the health facility immediately. Accompany her if possible.&lt;/span&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/refer_patient_note_2:label">
+            <value>&lt;span style="color:red"&gt;Please complete the follow-up task within 3 days.&lt;/span&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_abdominal_pain/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_abdominal_pain/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_abdominal_pain:label">
+            <value>Severe abdominal pain</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_headache/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_headache/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/severe_headache:label">
+            <value>Severe headache</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/vaginal_bleeding/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/vaginal_bleeding/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/vaginal_bleeding:label">
+            <value>Vaginal bleeding</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/very_pale/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/very_pale/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs/very_pale:label">
+            <value>Very pale</value>
+          </text>
+          <text id="/pregnancy_home_visit/danger_signs:label">
+            <value>Danger Sign Check</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/_id:label">
+            <value>What is the patient's name?</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/date_of_birth:label">
+            <value>Date of Birth</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/name:label">
+            <value>Name</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/parent/_id:label">
+            <value>Parent ID</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/parent/parent/contact/chw_name:label">
+            <value>CHW name</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/parent/parent/contact/phone:label">
+            <value>CHW phone</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/patient_id:label">
+            <value>Patient ID</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/sex:label">
+            <value>Sex</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/contact/short_name:label">
+            <value>Short Name</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/source:label">
+            <value>Source</value>
+          </text>
+          <text id="/pregnancy_home_visit/inputs/source_id:label">
+            <value>Source ID</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/abortion_date:jr:constraintMsg">
+            <value>Date cannot be in the future. Date cannot be older than LMP.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/abortion_date:label">
+            <value>Date of abortion</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/abortion_note:label">
+            <value>You have reported the woman has had an abortion. If she has not been seen by a care provider, please refer to the health facility.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/back_note:label">
+            <value>Click "&lt; Prev" to go back.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/cear_note:label">
+            <value>You can still submit pregnancy visits from the profile until the EDD is reached.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/clear_option/clear_all:label">
+            <value>Do not receive any more tasks about this pregnancy.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/clear_option/clear_this:label">
+            <value>Clear task for this visit only. Continue to receive tasks for this pregnancy.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/clear_option:label">
+            <value>What would you like to do?</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/end_pregnancy_note:label">
+            <value>Submitting this form will end the pregnancy. You will not receive any additional tasks.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/migrated_note:label">
+            <value>You have reported the woman has moved out of the area.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/miscarriage_date:jr:constraintMsg">
+            <value>Date cannot be in the future. Date cannot be older than LMP.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/miscarriage_date:label">
+            <value>Date of miscarriage</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/miscarriage_note:label">
+            <value>You have reported the woman has had a miscarriage. If she has not been seen by a care provider, please refer to the health facility.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/refusing_note:label">
+            <value>You have reported the woman has refused care.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended/submit_note:label">
+            <value>Click Submit to confirm.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_ended:label">
+            <value>Update Pregnancy</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/current_edd:label">
+            <value>Expected Date of Delivery(EDD): **<output value=" /pregnancy_home_visit/context_vars/edd_ctx "/>**</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/current_edd_unknown:label">
+            <value>Expected Date of Delivery(EDD): **unknown**</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant:label">
+            <value>Current Weeks Pregnant: **<output value=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx "/>**</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant_unknown:label">
+            <value>Current Weeks Pregnant: **unknown**</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/g_age_correct/no:label">
+            <value>No, I want to update.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/g_age_correct/yes:label">
+            <value>Yes, it is correct.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/g_age_correct:label">
+            <value>Is the gestational age above correct?</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option/abortion:label">
+            <value>No, Abortion</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option/migrated:label">
+            <value>No, Migrated out of area</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option/miscarriage:label">
+            <value>No, Miscarriage</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option/refused:label">
+            <value>No, Refusing care</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option:hint">
+            <value>Select one.</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary/visit_option:label">
+            <value>Do you want to start this pregnancy visit?</value>
+          </text>
+          <text id="/pregnancy_home_visit/pregnancy_summary:label">
+            <value>Pregnancy Summary</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med:label">
+            <value>Has <output value=" /pregnancy_home_visit/patient_short_name "/> received deworming medication?</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med_note:label">
+            <value>Worms can affect the nutritional status of <output value=" /pregnancy_home_visit/patient_short_name "/> and baby.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_importance_note:label">
+            <value>Frequent testing ensures that <output value=" /pregnancy_home_visit/patient_short_name "/> receives medicine to prevent transmission of HIV to the baby.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested:label">
+            <value>Has <output value=" /pregnancy_home_visit/patient_short_name "/> been tested for HIV in the past 3 months?</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily:label">
+            <value>Is <output value=" /pregnancy_home_visit/patient_short_name "/> taking iron folate daily?</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_note:label">
+            <value>Iron folate aids in the development of child's brain and spinal cord. It also prevents premature birth, sepsis, anemia and low birth weight.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_advice_note:label">
+            <value>Sleeping under a LLIN **EVERY night** prevents malaria.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use:label">
+            <value>Does <output value=" /pregnancy_home_visit/patient_short_name "/> use a long-lasting insecticidal net (LLIN)?</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/malaria/malaria_prophylaxis_note:label">
+            <value>Get malaria prophylaxis in second trimester if living in malaria endemic area.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/deliver_hf_note:label">
+            <value>It's safest to deliver in a health facility. Discuss a birth plan with <output value=" /pregnancy_home_visit/patient_short_name "/>.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/eat_more_note:label">
+            <value>Eat more often than usual and a balanced diet to give you strength and help the baby grow.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/respond_move_note:label">
+            <value>Respond to the baby's movements-kicks by gentle touching or massaging your tummy.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/talk_softly_note:label">
+            <value>Talk softly to the unborn baby. The baby can hear you and will be able to recognize voices.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received/no:label">
+            <value>No</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received/yes:label">
+            <value>Yes</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received:label">
+            <value>Has <output value=" /pregnancy_home_visit/patient_short_name "/> received any Tetanus Toxoid (TT) immunizations during this pregnancy?</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_1:label">
+            <value>Immunizing with at least two doses of tetanus toxoid before or during pregnancy protects the newborn for the first few weeks of life and protects the mother.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_2:label">
+            <value>Women can receive up to two TT vaccines per pregnancy. After five TT vaccines, they are vaccinated for life.</value>
+          </text>
+          <text id="/pregnancy_home_visit/safe_pregnancy_practices:label">
+            <value>Safe Pregnancy Practices</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator/woman:label">
+            <value>the woman</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator/woman-start:label">
+            <value>The woman</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_breaking_water:label">
+            <value>Breaking of water</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_breathlessness:label">
+            <value>Breathlessness</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_easily_tired:label">
+            <value>Getting tired easily</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_face_hand_swelling:label">
+            <value>Swelling of face and hands</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_fever:label">
+            <value>Fever</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_fits:label">
+            <value>Fits</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_reduced_or_no_fetal_movements:label">
+            <value>Reduced or no fetal movements</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_severe_abdominal_pain:label">
+            <value>Severe abdominal pain</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_severe_headache:label">
+            <value>Severe headache</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_vaginal_bleeding:label">
+            <value>Vaginal bleeding</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_sign_very_pale:label">
+            <value>Very pale</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_danger_signs:label">
+            <value>New Danger Signs</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_follow_up_tasks:label">
+            <value>Follow-up Tasks&lt;I class="fa fa-flag"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_following_tasks:label">
+            <value>The following tasks will appear:</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_fup_danger_sign:label">
+            <value>Please conduct a danger sign follow-up in 3 days.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_fup_hf_visit:label">
+            <value>Make sure <output value=" /pregnancy_home_visit/patient_short_name "/> attends her clinic visit on <output value=" /pregnancy_home_visit/summary/next_appointment_date "/>. Please remind her three days before.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_fup_pregnancy_visit:label">
+            <value>Please conduct the next pregnancy home visit in <output value=" /pregnancy_home_visit/summary/next_visit_weeks "/> week(s).</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_fup_pregnancy_visit_2_weeks:label">
+            <value>Please conduct the next pregnancy home visit in 2 weeks.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_patient_details:label">
+            <value>&lt;h2 style=&quot;text-align:center;margin-bottom:0px;&quot;&gt;<output value=" /pregnancy_home_visit/patient_name "/>&lt;/h2&gt; &lt;p style=&quot;text-align:center;&quot;&gt;<output value=" /pregnancy_home_visit/patient_age_in_years "/> years old&lt;/p&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_pregnancy_details:label">
+            <value>&lt;p&gt;<output value=" /pregnancy_home_visit/weeks_since_lmp_rounded "/> weeks pregnant.&lt;/p&gt; &lt;p&gt; EDD: <output value=" /pregnancy_home_visit/summary/edd_summary "/>&lt;/p&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_pregnancy_details_unknown:label">
+            <value>Unknown weeks pregnant.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_refer_clinic_immediately:label">
+            <value>Refer to clinic immediately for:</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_refer_danger_sign:label">
+            <value>Danger Sign</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_refer_hf_appropriate_time:label">
+            <value>Please refer <output value=" /pregnancy_home_visit/patient_short_name "/> to the health facility at the appropriate time.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_refer_hf_immediately:label">
+            <value>Please refer <output value=" /pregnancy_home_visit/patient_short_name "/> to the health facility immediately to receive the EDD and appropriate care.</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_referrals:label">
+            <value>Referrals&lt;I class="fa fa-hospital-o"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_request_service_deworming:label">
+            <value>Deworming</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_request_service_hiv_test:label">
+            <value>HIV test</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_request_service_iron:label">
+            <value>Iron folate</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_request_service_tt:label">
+            <value>TT</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_request_services:label">
+            <value>Request the following services:</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_additional:label">
+            <value><output value=" /pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk "/></value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_asthma:label">
+            <value>Asthma</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_diabetes:label">
+            <value>Diabetes</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_factors:label">
+            <value>New Risk Factors</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_heart_condition:label">
+            <value>Heart condition</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_risk_high_blood_pressure:label">
+            <value>High blood pressure</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_routine_anc:label">
+            <value>Please attend ANC on: <output value=" /pregnancy_home_visit/summary/next_appointment_date "/></value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_submit_note:label">
+            <value>&lt;h4 style="text-align:center;"&gt;Click the Submit button at the bottom of the form.&lt;/h4&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_summary:label">
+            <value>Summary&lt;I class="fa fa-user"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_summary_details:label">
+            <value>Patient&lt;i class="fa fa-user"&gt;&lt;/i&gt;</value>
+          </text>
+          <text id="/pregnancy_home_visit/summary/r_who_recommends:label">
+            <value>The WHO recommends routine ANC visits at 12, 20, 26, 30, 34, 36, 38, 40 weeks.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method/method_edd:label">
+            <value>Expected date of delivery</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method/method_weeks:label">
+            <value>Current weeks pregnant</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method:hint">
+            <value>Select one.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method:label">
+            <value>How would you like to update gestational age?</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new:jr:constraintMsg">
+            <value>Must be between 4 and 40.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new:label">
+            <value>Please enter the new current weeks pregnant.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/u_edd_new:jr:constraintMsg">
+            <value>Date cannot be in the past. Date cannot be more than 9 months in the future.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_method/u_edd_new:label">
+            <value>Please enter the new EDD.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/edd_check_note:label">
+            <value>If this seems incorrect, click "&lt; Prev" to update the pregnancy information.</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/new_edd:label">
+            <value>EDD: <output value=" /pregnancy_home_visit/update_g_age/edd_new "/></value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/new_g_age:label">
+            <value><output value=" /pregnancy_home_visit/weeks_since_lmp_rounded "/> weeks pregnant</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/new_info:label">
+            <value>**New**</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/previous_edd:label">
+            <value>EDD: <output value=" /pregnancy_home_visit/context_vars/edd_ctx "/></value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/previous_edd_unknown:label">
+            <value>EDD: unknown</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age:label">
+            <value><output value=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx "/> weeks pregnant</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age_unknown:label">
+            <value>Unknown weeks pregnant</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/previous_info:label">
+            <value>**Previous**</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age/update_summary/update_check_note:label">
+            <value>**Please confirm the new information and then click Next.**</value>
+          </text>
+          <text id="/pregnancy_home_visit/update_g_age:label">
+            <value>Update Pregnancy</value>
+          </text>
+          <text id="static_instance-age_correct_yes_no-0">
+            <value>Yes, it is correct.</value>
+          </text>
+          <text id="static_instance-age_correct_yes_no-1">
+            <value>No, I want to update.</value>
+          </text>
+          <text id="static_instance-clear_options-0">
+            <value>Clear task for this visit only. Continue to receive tasks for this pregnancy.</value>
+          </text>
+          <text id="static_instance-clear_options-1">
+            <value>Do not receive any more tasks about this pregnancy.</value>
+          </text>
+          <text id="static_instance-g_age_update_methods-0">
+            <value>Current weeks pregnant</value>
+          </text>
+          <text id="static_instance-g_age_update_methods-1">
+            <value>Expected date of delivery</value>
+          </text>
+          <text id="static_instance-knows_date-0">
+            <value>I don't know</value>
+          </text>
+          <text id="static_instance-knows_date-1">
+            <value>Enter date</value>
+          </text>
+          <text id="static_instance-lmp_approximations-0">
+            <value>Weeks</value>
+          </text>
+          <text id="static_instance-lmp_approximations-1">
+            <value>Months</value>
+          </text>
+          <text id="static_instance-no_info_pregnancy_reasons-0">
+            <value>The woman is visibly pregnant but does not know of how long.</value>
+          </text>
+          <text id="static_instance-no_info_pregnancy_reasons-1">
+            <value>You performed a pregnancy test and it is positive but the woman does not know the age of the pregnancy or LMP.</value>
+          </text>
+          <text id="static_instance-no_info_pregnancy_reasons-2">
+            <value>The woman is not on any family planning methods and has missed her periods.</value>
+          </text>
+          <text id="static_instance-risk_conditions-0">
+            <value>Heart condition</value>
+          </text>
+          <text id="static_instance-risk_conditions-1">
+            <value>Asthma</value>
+          </text>
+          <text id="static_instance-risk_conditions-2">
+            <value>High blood pressure</value>
+          </text>
+          <text id="static_instance-risk_conditions-3">
+            <value>Diabetes</value>
+          </text>
+          <text id="static_instance-risk_conditions-4">
+            <value>None of the above</value>
+          </text>
+          <text id="static_instance-translate_woman_label-0">
+            <value>the woman</value>
+          </text>
+          <text id="static_instance-translate_woman_start_label-0">
+            <value>The woman</value>
+          </text>
+          <text id="static_instance-visit_options-0">
+            <value>Yes</value>
+          </text>
+          <text id="static_instance-visit_options-1">
+            <value>No, Miscarriage</value>
+          </text>
+          <text id="static_instance-visit_options-2">
+            <value>No, Abortion</value>
+          </text>
+          <text id="static_instance-visit_options-3">
+            <value>No, Refusing care</value>
+          </text>
+          <text id="static_instance-visit_options-4">
+            <value>No, Migrated out of area</value>
+          </text>
+          <text id="static_instance-yes_no-0">
+            <value>Yes</value>
+          </text>
+          <text id="static_instance-yes_no-1">
+            <value>No</value>
+          </text>
+        </translation>
+      </itext>
+      <instance>
+        <pregnancy_home_visit id="pregnancy_home_visit" prefix="J1!pregnancy_home_visit!" delimiter="#" version="2022-09-26 11:35:11">
+          <inputs>
+            <meta>
+              <location>
+                <lat/>
+                <long/>
+                <error/>
+                <message/>
+              </location>
+            </meta>
+            <source>user</source>
+            <source_id/>
+            <contact>
+              <_id/>
+              <name/>
+              <short_name/>
+              <patient_id/>
+              <date_of_birth>0</date_of_birth>
+              <sex/>
+              <parent>
+                <_id/>
+                <parent>
+                  <contact>
+                    <chw_name/>
+                    <phone/>
+                  </contact>
+                </parent>
+              </parent>
+            </contact>
+          </inputs>
+          <patient_age_in_years tag="hidden"/>
+          <patient_uuid tag="hidden"/>
+          <patient_id tag="hidden"/>
+          <patient_name tag="hidden"/>
+          <patient_short_name tag="hidden"/>
+          <patient_short_name_start tag="hidden"/>
+          <lmp_date_8601 tag="hidden"/>
+          <edd_8601 tag="hidden"/>
+          <days_since_lmp tag="hidden"/>
+          <weeks_since_lmp tag="hidden"/>
+          <weeks_since_lmp_rounded tag="hidden"/>
+          <lmp_method_approx tag="hidden"/>
+          <lmp_updated tag="hidden"/>
+          <t_pregnancy_follow_up_date tag="hidden"/>
+          <t_pregnancy_follow_up tag="hidden"/>
+          <t_danger_signs_referral_follow_up_date tag="hidden"/>
+          <t_danger_signs_referral_follow_up tag="hidden"/>
+          <hiv_status_known tag="hidden"/>
+          <tt_received tag="hidden"/>
+          <deworming_med_received tag="hidden"/>
+          <context_vars tag="hidden">
+            <lmp_date_8601_ctx/>
+            <lmp_method_approx_ctx/>
+            <pregnancy_follow_up_date_recent_ctx/>
+            <risk_factors_ctx/>
+            <risk_factor_extra_ctx/>
+            <hiv_tested_ctx/>
+            <tt_received_ctx/>
+            <deworming_med_received_ctx/>
+            <edd_ctx/>
+            <weeks_since_lmp_rounded_ctx/>
+            <pregnancy_uuid_ctx/>
+          </context_vars>
+          <pregnancy_summary>
+            <current_weeks_pregnant tag="hidden"/>
+            <current_weeks_pregnant_unknown tag="hidden"/>
+            <current_edd tag="hidden"/>
+            <current_edd_unknown tag="hidden"/>
+            <visit_option/>
+            <g_age_correct/>
+          </pregnancy_summary>
+          <pregnancy_ended>
+            <miscarriage_note tag="hidden"/>
+            <miscarriage_date/>
+            <abortion_note tag="hidden"/>
+            <abortion_date tag="hidden"/>
+            <refusing_note tag="hidden"/>
+            <migrated_note tag="hidden"/>
+            <end_pregnancy_note tag="hidden"/>
+            <clear_option/>
+            <cear_note tag="hidden"/>
+            <submit_note tag="hidden"/>
+            <back_note tag="hidden"/>
+          </pregnancy_ended>
+          <update_g_age>
+            <update_method>
+              <g_age_update_method/>
+              <lmp_weeks_new/>
+              <u_edd_new/>
+            </update_method>
+            <update_summary tag="hidden">
+              <update_check_note/>
+              <previous_info/>
+              <previous_g_age/>
+              <previous_g_age_unknown/>
+              <previous_edd/>
+              <previous_edd_unknown/>
+              <new_info/>
+              <new_g_age/>
+              <new_edd/>
+              <edd_check_note/>
+            </update_summary>
+            <lmp_date_8601_new tag="hidden"/>
+            <lmp_date_new tag="hidden"/>
+            <edd_8601_new tag="hidden"/>
+            <edd_new tag="hidden"/>
+          </update_g_age>
+          <anc_visits_hf>
+            <anc_visits_hf_past>
+              <pregnancy_follow_up_date_recent/>
+              <last_visit_attended/>
+              <report_other_visits/>
+              <visited_hf_count/>
+              <visited_date_ask_single/>
+              <visited_date_single/>
+              <visited_dates_multiple_note tag="hidden"/>
+              <visited_dates_multiple_note_section tag="hidden"/>
+              <visited_dates_count/>
+              <visited_dates jr:template="">
+                <visited_date_ask_multiple/>
+                <visited_date/>
+              </visited_dates>
+            </anc_visits_hf_past>
+            <risk_factors>
+              <previous_risk_factors_note tag="hidden"/>
+              <no_previous_risks_note tag="hidden"/>
+              <first_pregnancy_note tag="hidden"/>
+              <previous_miscarriage_note tag="hidden"/>
+              <previous_difficulties_note tag="hidden"/>
+              <more_than_4_children_note tag="hidden"/>
+              <last_baby_born_less_than_1_year_ago_note tag="hidden"/>
+              <heart_condition_note tag="hidden"/>
+              <asthma_note tag="hidden"/>
+              <high_blood_pressure_note tag="hidden"/>
+              <diabetes_note tag="hidden"/>
+              <extra_risk_note tag="hidden"/>
+              <new_risks/>
+              <additional_risk_check/>
+              <additional_risk/>
+              <r_risk_factor_present/>
+            </risk_factors>
+            <anc_visits_hf_next>
+              <anc_next_visit_date>
+                <appointment_date_known/>
+                <appointment_date/>
+              </anc_next_visit_date>
+              <anc_visit_advice_note tag="hidden">
+                <who_recommends_note/>
+                <prenancy_age_note/>
+                <refer_note/>
+              </anc_visit_advice_note>
+            </anc_visits_hf_next>
+          </anc_visits_hf>
+          <danger_signs>
+            <danger_signs_note tag="hidden"/>
+            <danger_signs_question_note/>
+            <vaginal_bleeding/>
+            <fits/>
+            <severe_abdominal_pain/>
+            <severe_headache/>
+            <very_pale/>
+            <fever/>
+            <reduced_or_no_fetal_movements/>
+            <breaking_water/>
+            <easily_tired/>
+            <face_hand_swelling/>
+            <breathlessness/>
+            <r_danger_sign_present tag="hidden"/>
+            <congratulate_no_ds_note tag="hidden"/>
+            <refer_patient_note_1 tag="hidden"/>
+            <refer_patient_note_2 tag="hidden"/>
+          </danger_signs>
+          <safe_pregnancy_practices>
+            <malaria>
+              <llin_use/>
+              <llin_advice_note tag="hidden"/>
+              <malaria_prophylaxis_note tag="hidden"/>
+            </malaria>
+            <iron_folate>
+              <iron_folate_daily/>
+              <iron_folate_note tag="hidden"/>
+            </iron_folate>
+            <deworming>
+              <deworming_med/>
+              <deworming_med_note tag="hidden"/>
+            </deworming>
+            <safe_practices_tips tag="hidden">
+              <eat_more_note/>
+              <talk_softly_note/>
+              <respond_move_note/>
+              <deliver_hf_note/>
+            </safe_practices_tips>
+            <hiv_status>
+              <hiv_tested/>
+              <hiv_importance_note tag="hidden"/>
+            </hiv_status>
+            <tetanus>
+              <tt_imm_received/>
+              <tt_note_1 tag="hidden"/>
+              <tt_note_2 tag="hidden"/>
+            </tetanus>
+            <safe_pregnancy_practices/>
+          </safe_pregnancy_practices>
+          <summary tag="hidden">
+            <r_submit_note/>
+            <r_summary_details/>
+            <r_patient_details/>
+            <r_summary/>
+            <r_pregnancy_details/>
+            <r_pregnancy_details_unknown/>
+            <r_risk_factors/>
+            <r_risk_heart_condition/>
+            <r_risk_asthma/>
+            <r_risk_high_blood_pressure/>
+            <r_risk_diabetes/>
+            <r_risk_additional/>
+            <r_danger_signs/>
+            <r_danger_sign_vaginal_bleeding/>
+            <r_danger_sign_fits/>
+            <r_danger_sign_severe_abdominal_pain/>
+            <r_danger_sign_severe_headache/>
+            <r_danger_sign_very_pale/>
+            <r_danger_sign_fever/>
+            <r_danger_sign_reduced_or_no_fetal_movements/>
+            <r_danger_sign_breaking_water/>
+            <r_danger_sign_easily_tired/>
+            <r_danger_sign_face_hand_swelling/>
+            <r_danger_sign_breathlessness/>
+            <r_space_1/>
+            <r_referrals/>
+            <r_refer_clinic_immediately/>
+            <r_refer_danger_sign/>
+            <r_routine_anc/>
+            <r_request_services/>
+            <r_request_service_tt/>
+            <r_request_service_hiv_test/>
+            <r_request_service_deworming/>
+            <r_request_service_iron/>
+            <r_who_recommends/>
+            <r_refer_hf_appropriate_time/>
+            <r_refer_hf_immediately/>
+            <r_follow_up_tasks/>
+            <r_following_tasks/>
+            <r_fup_danger_sign/>
+            <r_fup_hf_visit/>
+            <r_fup_pregnancy_visit/>
+            <r_fup_pregnancy_visit_2_weeks/>
+            <next_visit_weeks/>
+            <edd_summary/>
+            <next_appointment_date/>
+            <custom_translations tag="hidden">
+              <custom_woman_label_translator/>
+              <custom_woman_label/>
+              <custom_woman_start_label_translator/>
+              <custom_woman_start_label/>
+            </custom_translations>
+          </summary>
+          <data tag="hidden">
+            <__activity_to_report/>
+            <__gestational_age_correct/>
+            <__miscarriage_date/>
+            <__abortion_date/>
+            <__visit_task_clear_option/>
+            <__gestational_age_update_method/>
+            <__gestational_age_update_weeks/>
+            <__gestational_age_update_edd/>
+            <__lmp_updated/>
+            <__lmp_date_new/>
+            <__edd_new/>
+            <__last_visit_attended/>
+            <__report_additional_anc_hf_visits/>
+            <__num_additional_anc_hf_visits/>
+            <__additional_anc_hf_visit_dates/>
+            <__has_risk_factors_not_previously_reported/>
+            <__heart_condition/>
+            <__asthma/>
+            <__high_blood_pressure/>
+            <__diabetes/>
+            <__additional_high_risk_condition_to_report/>
+            <__additional_high_risk_condition/>
+            <__next_anc_hf_visit_date_known/>
+            <__next_anc_hf_visit_date/>
+            <__vaginal_bleeding/>
+            <__fits/>
+            <__severe_abdominal_pain/>
+            <__severe_headache/>
+            <__very_pale/>
+            <__fever/>
+            <__reduced_or_no_fetal_movements/>
+            <__breaking_water/>
+            <__easily_tired/>
+            <__face_hand_swelling/>
+            <__breathlessness/>
+            <__has_danger_sign/>
+            <__uses_llin/>
+            <__takes_iron_folate_daily/>
+            <__received_deworming_meds/>
+            <__tested_for_hiv_in_past_3_months/>
+            <__received_tetanus_toxoid_this_pregnancy/>
+            <meta tag="hidden">
+              <__patient_uuid/>
+              <__patient_id/>
+              <__household_uuid/>
+              <__source/>
+              <__source_id/>
+              <__pregnancy_uuid/>
+            </meta>
+          </data>
+          <meta tag="hidden">
+            <instanceID/>
+          </meta>
+        </pregnancy_home_visit>
+      </instance>
+      <instance id="contact-summary"/>
+      <instance id="yes_no">
+        <root>
+          <item>
+            <itextId>static_instance-yes_no-0</itextId>
+            <name>yes</name>
+          </item>
+          <item>
+            <itextId>static_instance-yes_no-1</itextId>
+            <name>no</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="visit_options">
+        <root>
+          <item>
+            <itextId>static_instance-visit_options-0</itextId>
+            <name>yes</name>
+          </item>
+          <item>
+            <itextId>static_instance-visit_options-1</itextId>
+            <name>miscarriage</name>
+          </item>
+          <item>
+            <itextId>static_instance-visit_options-2</itextId>
+            <name>abortion</name>
+          </item>
+          <item>
+            <itextId>static_instance-visit_options-3</itextId>
+            <name>refused</name>
+          </item>
+          <item>
+            <itextId>static_instance-visit_options-4</itextId>
+            <name>migrated</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="age_correct_yes_no">
+        <root>
+          <item>
+            <itextId>static_instance-age_correct_yes_no-0</itextId>
+            <name>yes</name>
+          </item>
+          <item>
+            <itextId>static_instance-age_correct_yes_no-1</itextId>
+            <name>no</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="clear_options">
+        <root>
+          <item>
+            <itextId>static_instance-clear_options-0</itextId>
+            <name>clear_this</name>
+          </item>
+          <item>
+            <itextId>static_instance-clear_options-1</itextId>
+            <name>clear_all</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="g_age_update_methods">
+        <root>
+          <item>
+            <itextId>static_instance-g_age_update_methods-0</itextId>
+            <name>method_weeks</name>
+          </item>
+          <item>
+            <itextId>static_instance-g_age_update_methods-1</itextId>
+            <name>method_edd</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="lmp_approximations">
+        <root>
+          <item>
+            <itextId>static_instance-lmp_approximations-0</itextId>
+            <name>approx_weeks</name>
+          </item>
+          <item>
+            <itextId>static_instance-lmp_approximations-1</itextId>
+            <name>approx_months</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="no_info_pregnancy_reasons">
+        <root>
+          <item>
+            <itextId>static_instance-no_info_pregnancy_reasons-0</itextId>
+            <name>visibly_pregnant</name>
+          </item>
+          <item>
+            <itextId>static_instance-no_info_pregnancy_reasons-1</itextId>
+            <name>test_positive</name>
+          </item>
+          <item>
+            <itextId>static_instance-no_info_pregnancy_reasons-2</itextId>
+            <name>missed_periods</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="knows_date">
+        <root>
+          <item>
+            <itextId>static_instance-knows_date-0</itextId>
+            <name>no</name>
+          </item>
+          <item>
+            <itextId>static_instance-knows_date-1</itextId>
+            <name>yes</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="risk_conditions">
+        <root>
+          <item>
+            <itextId>static_instance-risk_conditions-0</itextId>
+            <name>heart_condition</name>
+          </item>
+          <item>
+            <itextId>static_instance-risk_conditions-1</itextId>
+            <name>asthma</name>
+          </item>
+          <item>
+            <itextId>static_instance-risk_conditions-2</itextId>
+            <name>high_blood_pressure</name>
+          </item>
+          <item>
+            <itextId>static_instance-risk_conditions-3</itextId>
+            <name>diabetes</name>
+          </item>
+          <item>
+            <itextId>static_instance-risk_conditions-4</itextId>
+            <name>none</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="translate_woman_label">
+        <root>
+          <item>
+            <itextId>static_instance-translate_woman_label-0</itextId>
+            <name>woman</name>
+          </item>
+        </root>
+      </instance>
+      <instance id="translate_woman_start_label">
+        <root>
+          <item>
+            <itextId>static_instance-translate_woman_start_label-0</itextId>
+            <name>woman-start</name>
+          </item>
+        </root>
+      </instance>
+      <bind nodeset="/pregnancy_home_visit/inputs" relevant="./source = 'user'"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/source" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/source_id" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/_id" type="db:person"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/name" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/short_name" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/patient_id" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/date_of_birth" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/sex" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/parent/_id" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/parent/parent/contact/chw_name" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/inputs/contact/parent/parent/contact/phone" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/patient_age_in_years" type="string" calculate="floor( difference-in-months( ../inputs/contact/date_of_birth, today() ) div 12 )"/>
+      <bind nodeset="/pregnancy_home_visit/patient_uuid" type="string" calculate="../inputs/contact/_id"/>
+      <bind nodeset="/pregnancy_home_visit/patient_id" type="string" calculate="../inputs/contact/patient_id"/>
+      <bind nodeset="/pregnancy_home_visit/patient_name" type="string" calculate="../inputs/contact/name"/>
+      <bind nodeset="/pregnancy_home_visit/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../summary/custom_translations/custom_woman_label)"/>
+      <bind nodeset="/pregnancy_home_visit/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../summary/custom_translations/custom_woman_start_label)"/>
+      <bind nodeset="/pregnancy_home_visit/lmp_date_8601" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no'), ../update_g_age/lmp_date_8601_new, ../context_vars/lmp_date_8601_ctx)"/>
+      <bind nodeset="/pregnancy_home_visit/edd_8601" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no'), ../update_g_age/edd_8601_new, format-date-time(date-time(decimal-date-time(../context_vars/lmp_date_8601_ctx + 280)), &quot;%Y-%m-%d&quot;))"/>
+      <bind nodeset="/pregnancy_home_visit/days_since_lmp" type="string" calculate="floor(decimal-date-time(today()) - decimal-date-time(../lmp_date_8601))" relevant="../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/weeks_since_lmp" type="string" calculate="round(../days_since_lmp div 7, 2)" relevant="../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/weeks_since_lmp_rounded" type="string" calculate="floor(../days_since_lmp div 7)" relevant="../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/lmp_method_approx" type="string" calculate="if(selected(../update_g_age/update_method/g_age_update_method, 'method_weeks'), 'yes', 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/lmp_updated" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no') and (decimal-date-time(../lmp_date_8601) - decimal-date-time(../context_vars/lmp_date_8601_ctx) != 0), 'yes', 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/t_pregnancy_follow_up_date" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date"/>
+      <bind nodeset="/pregnancy_home_visit/t_pregnancy_follow_up" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known"/>
+      <bind nodeset="/pregnancy_home_visit/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
+      <bind nodeset="/pregnancy_home_visit/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
+      <bind nodeset="/pregnancy_home_visit/hiv_status_known" type="string" calculate="if(../context_vars/hiv_tested_ctx = 'yes', 'yes', ../safe_pregnancy_practices/hiv_status/hiv_tested)"/>
+      <bind nodeset="/pregnancy_home_visit/tt_received" type="string" calculate="if(../context_vars/tt_received_ctx = 'yes', 'yes', ../safe_pregnancy_practices/tetanus/tt_imm_received)"/>
+      <bind nodeset="/pregnancy_home_visit/deworming_med_received" type="string" calculate="if(../context_vars/deworming_med_received_ctx = 'yes', 'yes', ../safe_pregnancy_practices/deworming/deworming_med)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/lmp_date_8601_ctx" type="string" calculate="if(instance('contact-summary')/context/lmp_date_8601 != '', instance('contact-summary')/context/lmp_date_8601, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/lmp_method_approx_ctx" type="string" calculate="if(instance('contact-summary')/context/lmp_method_approx != '', instance('contact-summary')/context/lmp_method_approx, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/pregnancy_follow_up_date_recent_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_follow_up_date_recent != 0, instance('contact-summary')/context/pregnancy_follow_up_date_recent, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/risk_factors_ctx" type="string" calculate="if(instance('contact-summary')/context/risk_factor_codes != '', instance('contact-summary')/context/risk_factor_codes, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/risk_factor_extra_ctx" type="string" calculate="if(instance('contact-summary')/context/risk_factor_extra != '', instance('contact-summary')/context/risk_factor_extra, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/hiv_tested_ctx" type="string" calculate="if(instance('contact-summary')/context/hiv_tested_past != '', instance('contact-summary')/context/hiv_tested_past, .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/tt_received_ctx" type="string" calculate="if(instance('contact-summary')/context/tt_received_past != '', instance('contact-summary')/context/tt_received_past , .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/deworming_med_received_ctx" type="string" calculate="if(instance('contact-summary')/context/deworming_med_received_past != '', instance('contact-summary')/context/deworming_med_received_past , .)"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/edd_ctx" type="string" calculate="if(../lmp_date_8601_ctx = '', 'unknown', format-date-time(date-time(decimal-date-time(../lmp_date_8601_ctx) + 280), &quot;%e %b, %Y&quot;))"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx" type="string" calculate="if(../lmp_date_8601_ctx = '', 'unknown',
+floor((decimal-date-time(today()) - decimal-date-time(../lmp_date_8601_ctx)) div 7))"/>
+      <bind nodeset="/pregnancy_home_visit/context_vars/pregnancy_uuid_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_uuid != '', instance('contact-summary')/context/pregnancy_uuid, .)"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  != 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant_unknown" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  = 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_edd" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/edd_ctx  != 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_edd_unknown" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/edd_ctx  = 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/visit_option" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_summary/g_age_correct" type="select1" required="true()" relevant="selected(../visit_option, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended" relevant="not(selected(../pregnancy_summary/visit_option, 'yes'))"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/miscarriage_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/miscarriage_date" type="date" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage')" constraint=". &lt;= today() and ( /pregnancy_home_visit/lmp_date_8601  = '' or . &gt;=  /pregnancy_home_visit/lmp_date_8601 )" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/miscarriage_date:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/abortion_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'abortion')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/abortion_date" type="date" relevant="selected(../../pregnancy_summary/visit_option, 'abortion')" constraint=". &lt;= today() and ( /pregnancy_home_visit/lmp_date_8601  = '' or . &gt;=  /pregnancy_home_visit/lmp_date_8601 )" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/abortion_date:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/refusing_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'refused')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/migrated_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'migrated')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/end_pregnancy_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage') or
+selected(../../pregnancy_summary/visit_option, 'abortion')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/clear_option" type="select1" required="true()" relevant="selected(../../pregnancy_summary/visit_option, 'refused') or
+selected(../../pregnancy_summary/visit_option, 'migrated')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/cear_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'refused') or
+selected(../../pregnancy_summary/visit_option, 'migrated')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/submit_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/back_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age" relevant="selected(../pregnancy_summary/visit_option, 'yes') and
+selected(../pregnancy_summary/g_age_correct, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new" type="int" required="true()" constraint=". &gt;= 4 and . &lt;= 40" relevant="selected(../g_age_update_method, 'method_weeks')" jr:constraintMsg="jr:itext('/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/u_edd_new" type="date" relevant="selected(../g_age_update_method, 'method_edd')" constraint=". &gt;= today() and
+. &lt;= date-time(decimal-date-time(today()) + (9 * 30))" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/update_g_age/update_method/u_edd_new:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/update_check_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_info" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  != 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age_unknown" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  = 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_edd" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/edd_ctx  != 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_edd_unknown" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/edd_ctx  = 'unknown'"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/new_info" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/new_g_age" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/new_edd" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/edd_check_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/lmp_date_8601_new" type="string" calculate="format-date-time(
+if(selected(../update_method/g_age_update_method, 'method_weeks'), date-time(decimal-date-time(today()) - (../update_method/lmp_weeks_new * 7)), 
+if(selected(../update_method/g_age_update_method, 'method_edd'), date-time(decimal-date-time(../update_method/u_edd_new) - 280), 0)
+), &quot;%Y-%m-%d&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/lmp_date_new" type="string" calculate="format-date-time(../lmp_date_8601_new, &quot;%e %b, %Y&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/edd_8601_new" type="string" calculate="format-date-time(date-time(decimal-date-time(../lmp_date_8601_new)+280),&quot;%Y-%m-%d&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/edd_new" type="string" calculate="format-date-time(../edd_8601_new, &quot;%e %b, %Y&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf" relevant="selected(../pregnancy_summary/visit_option, 'yes') and
+../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/pregnancy_follow_up_date_recent" type="string" calculate="format-date-time(../../../context_vars/pregnancy_follow_up_date_recent_ctx, &quot;%e %b, %Y&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended" type="select1" required="true()" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/pregnancy_follow_up_date_recent  != ''"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count" type="int" required="true()" constraint=".&gt;= 0 and . &lt;= 9" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:jr:constraintMsg')" relevant="selected(../report_other_visits, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single" type="select1" required="true()" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  = 1"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single" type="date" relevant="selected(../visited_date_ask_single, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy_home_visit/lmp_date_8601 " required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note_section" readonly="true()" type="string" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_count" type="string" readonly="true()" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count "/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple" type="select1" required="true()" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date" type="date" relevant="selected(../visited_date_ask_multiple, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy_home_visit/lmp_date_8601 " required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_risk_factors_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/no_previous_risks_note" readonly="true()" type="string" relevant="../../../context_vars/risk_factors_ctx = ''"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/first_pregnancy_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'first_pregnancy')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_miscarriage_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'previous_miscarriage')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_difficulties_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'previous_difficulties')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/more_than_4_children_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'more_than_4_children')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/last_baby_born_less_than_1_year_ago_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'last_baby_born_less_than_1_year_ago')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/heart_condition_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'heart_condition')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/asthma_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'asthma')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/high_blood_pressure_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'high_blood_pressure')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/diabetes_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'diabetes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/extra_risk_note" readonly="true()" type="string" relevant="../../../context_vars/risk_factor_extra_ctx != ''"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks" type="select" required="true()" constraint="not(selected(.,'none')) or count-selected(.) &lt; 2" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:jr:constraintMsg')" relevant="not(contains(../../../context_vars/risk_factors_ctx, 'heart_condition') and
+contains(../../../context_vars/risk_factors_ctx, 'asthma') and
+contains(../../../context_vars/risk_factors_ctx, 'high_blood_pressure') and
+contains(../../../context_vars/risk_factors_ctx, 'diabetes'))"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk" type="string" required="true()" constraint="string-length(.) &lt;= 100" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk:jr:constraintMsg')" relevant="selected(../additional_risk_check, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/r_risk_factor_present" type="string" calculate="if(selected(../new_risks, 'heart_condition') or
+selected(../new_risks, 'asthma') or
+selected(../new_risks, 'high_blood_pressure') or
+selected(../new_risks, 'diabetes') or
+selected(../additional_risk_check, 'yes')
+, 'yes', 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date" type="date" relevant="selected(../appointment_date_known, 'yes')" constraint="(. &gt;= today()) and
+(decimal-date-time(.) &lt;= decimal-date-time(today() + 30))" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note" relevant="selected(../anc_next_visit_date/appointment_date_known, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/refer_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs" relevant="selected(../pregnancy_summary/visit_option, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/danger_signs_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/danger_signs_question_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/vaginal_bleeding" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/fits" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/severe_abdominal_pain" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/severe_headache" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/very_pale" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/fever" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/breaking_water" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/easily_tired" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/face_hand_swelling" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/breathlessness" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/r_danger_sign_present" type="string" calculate="if(selected(../vaginal_bleeding, 'yes')
+or selected(../fits, 'yes')
+or selected(../severe_abdominal_pain, 'yes')
+or selected(../severe_headache, 'yes')
+or selected(../very_pale, 'yes')
+or selected(../fever, 'yes')
+or selected(../reduced_or_no_fetal_movements, 'yes')
+or selected(../breaking_water, 'yes')
+or selected(../easily_tired, 'yes')
+or selected(../face_hand_swelling, 'yes')
+or selected(../breathlessness, 'yes'), 
+'yes',
+if(selected(../vaginal_bleeding, 'no')
+and selected(../fits, 'no')
+and selected(../severe_abdominal_pain, 'no')
+and selected(../severe_headache, 'no')
+and selected(../very_pale, 'no')
+and selected(../fever, 'no')
+and selected(../reduced_or_no_fetal_movements, 'no')
+and selected(../breaking_water, 'no')
+and selected(../easily_tired, 'no')
+and selected(../face_hand_swelling, 'no')
+and selected(../breathlessness, 'no'), 'no', ''))"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/congratulate_no_ds_note" readonly="true()" type="string" relevant="../r_danger_sign_present = 'no'"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/refer_patient_note_1" readonly="true()" type="string" relevant="../r_danger_sign_present = 'yes'"/>
+      <bind nodeset="/pregnancy_home_visit/danger_signs/refer_patient_note_2" readonly="true()" type="string" relevant="../r_danger_sign_present = 'yes'"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices" relevant="selected(../pregnancy_summary/visit_option, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_advice_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/malaria/malaria_prophylaxis_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/deworming" relevant=" /pregnancy_home_visit/weeks_since_lmp  &gt; 12 and ../../context_vars/deworming_med_received_ctx != 'yes'"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips" relevant="../../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/eat_more_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/weeks_since_lmp  &lt;= 24"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/talk_softly_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/weeks_since_lmp  &gt;= 25 and  /pregnancy_home_visit/weeks_since_lmp  &lt;= 30"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/respond_move_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/weeks_since_lmp  &gt;= 25 and  /pregnancy_home_visit/weeks_since_lmp  &lt;= 30"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/deliver_hf_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/weeks_since_lmp  &gt;= 31"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status" relevant="../../context_vars/hiv_tested_ctx != 'yes'"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_importance_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/tetanus" relevant="../../context_vars/tt_received_ctx != 'yes' and
+(selected(../../anc_visits_hf/anc_visits_hf_past/last_visit_attended, 'yes') or
+selected(../../anc_visits_hf/anc_visits_hf_past/report_other_visits, 'yes'))"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received" type="select1" required="true()"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_1" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_2" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/safe_pregnancy_practices/safe_pregnancy_practices" type="string" calculate="if((selected(../tetanus/tt_imm_received, 'no') or
+selected(../hiv_status/hiv_tested, 'no') or
+selected(../deworming/deworming_med, 'no') or
+selected(../iron_folate/iron_folate_daily, 'no')), 'yes', 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary" relevant="selected(../pregnancy_summary/visit_option, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_submit_note" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_summary_details" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_patient_details" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_summary" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_pregnancy_details" readonly="true()" type="string" relevant="../../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_pregnancy_details_unknown" readonly="true()" type="string" relevant="../../lmp_date_8601 = ''"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_factors" readonly="true()" type="string" relevant="../../anc_visits_hf/risk_factors/r_risk_factor_present = 'yes'"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_heart_condition" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/risk_factors/new_risks, 'heart_condition')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_asthma" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/risk_factors/new_risks, 'asthma')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_high_blood_pressure" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/risk_factors/new_risks, 'high_blood_pressure')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_diabetes" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/risk_factors/new_risks, 'diabetes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_risk_additional" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/risk_factors/additional_risk_check, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_signs" readonly="true()" type="string" relevant="selected(../../danger_signs/r_danger_sign_present, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_vaginal_bleeding" readonly="true()" type="string" relevant="selected(../../danger_signs/vaginal_bleeding, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_fits" readonly="true()" type="string" relevant="selected(../../danger_signs/fits, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_severe_abdominal_pain" readonly="true()" type="string" relevant="selected(../../danger_signs/severe_abdominal_pain, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_severe_headache" readonly="true()" type="string" relevant="selected(../../danger_signs/severe_headache, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_very_pale" readonly="true()" type="string" relevant="selected(../../danger_signs/very_pale, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_fever" readonly="true()" type="string" relevant="selected(../../danger_signs/fever, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_reduced_or_no_fetal_movements" readonly="true()" type="string" relevant="selected(../../danger_signs/reduced_or_no_fetal_movements, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_breaking_water" readonly="true()" type="string" relevant="selected(../../danger_signs/breaking_water, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_easily_tired" readonly="true()" type="string" relevant="selected(../../danger_signs/easily_tired, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_face_hand_swelling" readonly="true()" type="string" relevant="selected(../../danger_signs/face_hand_swelling, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_danger_sign_breathlessness" readonly="true()" type="string" relevant="selected(../../danger_signs/breathlessness, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_space_1" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_referrals" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_refer_clinic_immediately" readonly="true()" type="string" relevant="selected(../../danger_signs/r_danger_sign_present, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_refer_danger_sign" readonly="true()" type="string" relevant="selected(../../danger_signs/r_danger_sign_present, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_routine_anc" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_request_services" readonly="true()" type="string" relevant="selected(../../safe_pregnancy_practices/tetanus/tt_imm_received, 'no') or
+selected(../../safe_pregnancy_practices/hiv_status/hiv_tested, 'no') or
+selected(../../safe_pregnancy_practices/deworming/deworming_med, 'no') or
+selected(../../safe_pregnancy_practices/iron_folate/iron_folate_daily, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_request_service_tt" readonly="true()" type="string" relevant="selected(../../safe_pregnancy_practices/tetanus/tt_imm_received, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_request_service_hiv_test" readonly="true()" type="string" relevant="selected(../../safe_pregnancy_practices/hiv_status/hiv_tested, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_request_service_deworming" readonly="true()" type="string" relevant="selected(../../safe_pregnancy_practices/deworming/deworming_med, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_request_service_iron" readonly="true()" type="string" relevant="selected(../../safe_pregnancy_practices/iron_folate/iron_folate_daily, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_who_recommends" readonly="true()" type="string" relevant="../../lmp_date_8601 = '' or selected(../../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_refer_hf_appropriate_time" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known, 'no')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_refer_hf_immediately" readonly="true()" type="string" relevant="../../lmp_date_8601 = ''"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_follow_up_tasks" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_following_tasks" readonly="true()" type="string"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_fup_danger_sign" readonly="true()" type="string" relevant="selected(../../danger_signs/r_danger_sign_present, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_fup_hf_visit" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_fup_pregnancy_visit" readonly="true()" type="string" relevant="../../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/summary/r_fup_pregnancy_visit_2_weeks" readonly="true()" type="string" relevant="../../lmp_date_8601 = ''"/>
+      <bind nodeset="/pregnancy_home_visit/summary/next_visit_weeks" type="string" calculate="round((if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7, 0
+)))))))) - decimal-date-time(today())) div 7, 0)"/>
+      <bind nodeset="/pregnancy_home_visit/summary/edd_summary" type="string" calculate="format-date-time( /pregnancy_home_visit/edd_8601 , &quot;%e %b, %Y&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/summary/next_appointment_date" type="string" calculate="format-date-time( /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date , &quot;%e %b, %Y&quot;)"/>
+      <bind nodeset="/pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator" type="select1" calculate="&quot;woman&quot;"/>
+      <bind nodeset="/pregnancy_home_visit/summary/custom_translations/custom_woman_label" type="string" calculate="jr:choice-name( /pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator ,' /pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator ')"/>
+      <bind nodeset="/pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator" type="select1" calculate="&quot;woman-start&quot;"/>
+      <bind nodeset="/pregnancy_home_visit/summary/custom_translations/custom_woman_start_label" type="string" calculate="jr:choice-name( /pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator ,' /pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator ')"/>
+      <bind nodeset="/pregnancy_home_visit/data/__activity_to_report" type="string" calculate="if ( /pregnancy_home_visit/pregnancy_summary/visit_option  = 'yes', 'home_visit',  /pregnancy_home_visit/pregnancy_summary/visit_option )"/>
+      <bind nodeset="/pregnancy_home_visit/data/__gestational_age_correct" type="string" calculate=" /pregnancy_home_visit/pregnancy_summary/g_age_correct "/>
+      <bind nodeset="/pregnancy_home_visit/data/__miscarriage_date" type="string" calculate=" /pregnancy_home_visit/pregnancy_ended/miscarriage_date "/>
+      <bind nodeset="/pregnancy_home_visit/data/__abortion_date" type="string" calculate=" /pregnancy_home_visit/pregnancy_ended/abortion_date "/>
+      <bind nodeset="/pregnancy_home_visit/data/__visit_task_clear_option" type="string" calculate=" /pregnancy_home_visit/pregnancy_ended/clear_option "/>
+      <bind nodeset="/pregnancy_home_visit/data/__gestational_age_update_method" type="string" calculate=" /pregnancy_home_visit/update_g_age/update_method/g_age_update_method "/>
+      <bind nodeset="/pregnancy_home_visit/data/__gestational_age_update_weeks" type="string" calculate=" /pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new "/>
+      <bind nodeset="/pregnancy_home_visit/data/__gestational_age_update_edd" type="string" calculate=" /pregnancy_home_visit/update_g_age/update_method/u_edd_new "/>
+      <bind nodeset="/pregnancy_home_visit/data/__lmp_updated" type="string" calculate=" /pregnancy_home_visit/lmp_updated "/>
+      <bind nodeset="/pregnancy_home_visit/data/__lmp_date_new" type="string" calculate=" /pregnancy_home_visit/update_g_age/lmp_date_8601_new "/>
+      <bind nodeset="/pregnancy_home_visit/data/__edd_new" type="string" calculate=" /pregnancy_home_visit/update_g_age/edd_8601_new "/>
+      <bind nodeset="/pregnancy_home_visit/data/__last_visit_attended" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended "/>
+      <bind nodeset="/pregnancy_home_visit/data/__report_additional_anc_hf_visits" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits "/>
+      <bind nodeset="/pregnancy_home_visit/data/__num_additional_anc_hf_visits" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count "/>
+      <bind nodeset="/pregnancy_home_visit/data/__additional_anc_hf_visit_dates" type="string" calculate="coalesce( /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single , join(',',  /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date ), NULL)"/>
+      <bind nodeset="/pregnancy_home_visit/data/__has_risk_factors_not_previously_reported" type="string" calculate="if (selected( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks , 'none'), 'no', if( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks  = '', '', 'yes'))"/>
+      <bind nodeset="/pregnancy_home_visit/data/__heart_condition" type="string" calculate="if(selected( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks , 'heart_condition'),'yes',if( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks  = '', '','no'))"/>
+      <bind nodeset="/pregnancy_home_visit/data/__asthma" type="string" calculate="if(selected( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks , 'asthma'),'yes',if( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks  = '', '','no'))"/>
+      <bind nodeset="/pregnancy_home_visit/data/__high_blood_pressure" type="string" calculate="if(selected( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks , 'high_blood_pressure'),'yes',if( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks  = '', '','no'))"/>
+      <bind nodeset="/pregnancy_home_visit/data/__diabetes" type="string" calculate="if(selected( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks , 'diabetes'),'yes',if( /pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks  = '', '','no'))"/>
+      <bind nodeset="/pregnancy_home_visit/data/__additional_high_risk_condition_to_report" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check "/>
+      <bind nodeset="/pregnancy_home_visit/data/__additional_high_risk_condition" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk "/>
+      <bind nodeset="/pregnancy_home_visit/data/__next_anc_hf_visit_date_known" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known "/>
+      <bind nodeset="/pregnancy_home_visit/data/__next_anc_hf_visit_date" type="string" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date "/>
+      <bind nodeset="/pregnancy_home_visit/data/__vaginal_bleeding" type="string" calculate=" /pregnancy_home_visit/danger_signs/vaginal_bleeding "/>
+      <bind nodeset="/pregnancy_home_visit/data/__fits" type="string" calculate=" /pregnancy_home_visit/danger_signs/fits "/>
+      <bind nodeset="/pregnancy_home_visit/data/__severe_abdominal_pain" type="string" calculate=" /pregnancy_home_visit/danger_signs/severe_abdominal_pain "/>
+      <bind nodeset="/pregnancy_home_visit/data/__severe_headache" type="string" calculate=" /pregnancy_home_visit/danger_signs/severe_headache "/>
+      <bind nodeset="/pregnancy_home_visit/data/__very_pale" type="string" calculate=" /pregnancy_home_visit/danger_signs/very_pale "/>
+      <bind nodeset="/pregnancy_home_visit/data/__fever" type="string" calculate=" /pregnancy_home_visit/danger_signs/fever "/>
+      <bind nodeset="/pregnancy_home_visit/data/__reduced_or_no_fetal_movements" type="string" calculate=" /pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements "/>
+      <bind nodeset="/pregnancy_home_visit/data/__breaking_water" type="string" calculate=" /pregnancy_home_visit/danger_signs/breaking_water "/>
+      <bind nodeset="/pregnancy_home_visit/data/__easily_tired" type="string" calculate=" /pregnancy_home_visit/danger_signs/easily_tired "/>
+      <bind nodeset="/pregnancy_home_visit/data/__face_hand_swelling" type="string" calculate=" /pregnancy_home_visit/danger_signs/face_hand_swelling "/>
+      <bind nodeset="/pregnancy_home_visit/data/__breathlessness" type="string" calculate=" /pregnancy_home_visit/danger_signs/breathlessness "/>
+      <bind nodeset="/pregnancy_home_visit/data/__has_danger_sign" type="string" calculate=" /pregnancy_home_visit/danger_signs/r_danger_sign_present "/>
+      <bind nodeset="/pregnancy_home_visit/data/__uses_llin" type="string" calculate=" /pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use "/>
+      <bind nodeset="/pregnancy_home_visit/data/__takes_iron_folate_daily" type="string" calculate=" /pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily "/>
+      <bind nodeset="/pregnancy_home_visit/data/__received_deworming_meds" type="string" calculate=" /pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med "/>
+      <bind nodeset="/pregnancy_home_visit/data/__tested_for_hiv_in_past_3_months" type="string" calculate=" /pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested "/>
+      <bind nodeset="/pregnancy_home_visit/data/__received_tetanus_toxoid_this_pregnancy" type="string" calculate=" /pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received "/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__patient_uuid" type="string" calculate="../../../inputs/contact/_id"/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__patient_id" type="string" calculate="../../../inputs/contact/patient_id"/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__household_uuid" type="string" calculate="../../../inputs/contact/parent/_id"/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__source" type="string" calculate="../../../inputs/source"/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__source_id" type="string" calculate="../../../inputs/source_id"/>
+      <bind nodeset="/pregnancy_home_visit/data/meta/__pregnancy_uuid" type="string" calculate=" /pregnancy_home_visit/context_vars/pregnancy_uuid_ctx "/>
+      <bind nodeset="/pregnancy_home_visit/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
+    </model>
+  </h:head>
+  <h:body class="pages">
+    <group appearance="field-list" ref="/pregnancy_home_visit/inputs">
+      <group ref="/pregnancy_home_visit/inputs/contact">
+        <input appearance="db-object" ref="/pregnancy_home_visit/inputs/contact/_id">
+          <label ref="jr:itext('/pregnancy_home_visit/inputs/contact/_id:label')"/>
+        </input>
+        <group ref="/pregnancy_home_visit/inputs/contact/parent">
+          <group ref="/pregnancy_home_visit/inputs/contact/parent/parent">
+            <group ref="/pregnancy_home_visit/inputs/contact/parent/parent/contact"/>
+          </group>
+        </group>
+      </group>
+    </group>
+    <group ref="/pregnancy_home_visit/context_vars"/>
+    <group appearance="field-list" ref="/pregnancy_home_visit/pregnancy_summary">
+      <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary:label')"/>
+      <input ref="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant_unknown">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant_unknown:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_summary/current_edd">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/current_edd:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_summary/current_edd_unknown">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/current_edd_unknown:label')"/>
+      </input>
+      <select1 ref="/pregnancy_home_visit/pregnancy_summary/visit_option">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option:label')"/>
+        <hint ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option:hint')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option/miscarriage:label')"/>
+          <value>miscarriage</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option/abortion:label')"/>
+          <value>abortion</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option/refused:label')"/>
+          <value>refused</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/visit_option/migrated:label')"/>
+          <value>migrated</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/pregnancy_summary/g_age_correct">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/g_age_correct:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/g_age_correct/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_summary/g_age_correct/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+    </group>
+    <group appearance="field-list" ref="/pregnancy_home_visit/pregnancy_ended">
+      <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended:label')"/>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/miscarriage_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/miscarriage_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/miscarriage_date">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/miscarriage_date:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/abortion_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/abortion_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/abortion_date">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/abortion_date:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/refusing_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/refusing_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/migrated_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/migrated_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/end_pregnancy_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/end_pregnancy_note:label')"/>
+      </input>
+      <select1 ref="/pregnancy_home_visit/pregnancy_ended/clear_option">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/clear_option:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/clear_option/clear_this:label')"/>
+          <value>clear_this</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/clear_option/clear_all:label')"/>
+          <value>clear_all</value>
+        </item>
+      </select1>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/cear_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/cear_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/submit_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/submit_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/pregnancy_ended/back_note">
+        <label ref="jr:itext('/pregnancy_home_visit/pregnancy_ended/back_note:label')"/>
+      </input>
+    </group>
+    <group ref="/pregnancy_home_visit/update_g_age">
+      <label ref="jr:itext('/pregnancy_home_visit/update_g_age:label')"/>
+      <group appearance="field-list" ref="/pregnancy_home_visit/update_g_age/update_method">
+        <select1 ref="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/g_age_update_method:label')"/>
+          <hint ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/g_age_update_method:hint')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/g_age_update_method/method_weeks:label')"/>
+            <value>method_weeks</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/g_age_update_method/method_edd:label')"/>
+            <value>method_edd</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_method/u_edd_new">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_method/u_edd_new:label')"/>
+        </input>
+      </group>
+      <group appearance="field-list" ref="/pregnancy_home_visit/update_g_age/update_summary">
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/update_check_note">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/update_check_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/previous_info">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/previous_info:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/previous_g_age:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age_unknown">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/previous_g_age_unknown:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/previous_edd">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/previous_edd:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/previous_edd_unknown">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/previous_edd_unknown:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/new_info">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/new_info:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/new_g_age">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/new_g_age:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/new_edd">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/new_edd:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/update_g_age/update_summary/edd_check_note">
+          <label ref="jr:itext('/pregnancy_home_visit/update_g_age/update_summary/edd_check_note:label')"/>
+        </input>
+      </group>
+    </group>
+    <group ref="/pregnancy_home_visit/anc_visits_hf">
+      <group appearance="field-list" ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past">
+        <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past:label')"/>
+        <select1 ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/last_visit_attended/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <select1 ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:label')"/>
+          <hint ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:hint')"/>
+        </input>
+        <select1 ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single/no:label')"/>
+            <value>no</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single/yes:label')"/>
+            <value>yes</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note_section">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note_section:label')"/>
+        </input>
+        <group ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates:label')"/>
+          <repeat nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates" jr:count=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_count ">
+            <select1 ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple">
+              <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple:label')"/>
+              <item>
+                <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple/no:label')"/>
+                <value>no</value>
+              </item>
+              <item>
+                <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple/yes:label')"/>
+                <value>yes</value>
+              </item>
+            </select1>
+            <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date">
+              <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:label')"/>
+            </input>
+          </repeat>
+        </group>
+      </group>
+      <group appearance="field-list summary" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors">
+        <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors:label')"/>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_risk_factors_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_risk_factors_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/no_previous_risks_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/no_previous_risks_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/first_pregnancy_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/first_pregnancy_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_miscarriage_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_miscarriage_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_difficulties_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_difficulties_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/more_than_4_children_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/more_than_4_children_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/last_baby_born_less_than_1_year_ago_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/last_baby_born_less_than_1_year_ago_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/heart_condition_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/heart_condition_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/asthma_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/asthma_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/high_blood_pressure_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/high_blood_pressure_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/diabetes_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/diabetes_note:label')"/>
+        </input>
+        <input appearance="li" ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/extra_risk_note">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/extra_risk_note:label')"/>
+        </input>
+        <select ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:label')"/>
+          <hint ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/new_risks:hint')"/>
+          <itemset nodeset="instance('risk_conditions')/root/item[not(contains( /pregnancy_home_visit/context_vars/risk_factors_ctx , name)) or name = 'none']">
+            <value ref="name"/>
+            <label ref="jr:itext(itextId)"/>
+          </itemset>
+        </select>
+        <select1 ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk_check/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk">
+          <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/risk_factors/additional_risk:label')"/>
+        </input>
+      </group>
+      <group ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next">
+        <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next:label')"/>
+        <group appearance="field-list" ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date">
+          <select1 ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known">
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known:label')"/>
+            <item>
+              <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known/no:label')"/>
+              <value>no</value>
+            </item>
+            <item>
+              <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known/yes:label')"/>
+              <value>yes</value>
+            </item>
+          </select1>
+          <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date"/>
+        </group>
+        <group appearance="field-list" ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note">
+          <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note">
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note:label')"/>
+          </input>
+          <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note">
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note:label')"/>
+          </input>
+          <input ref="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/refer_note">
+            <label ref="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/refer_note:label')"/>
+          </input>
+        </group>
+      </group>
+    </group>
+    <group appearance="field-list" ref="/pregnancy_home_visit/danger_signs">
+      <label ref="jr:itext('/pregnancy_home_visit/danger_signs:label')"/>
+      <input ref="/pregnancy_home_visit/danger_signs/danger_signs_note">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/danger_signs_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/danger_signs/danger_signs_question_note">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/danger_signs_question_note:label')"/>
+      </input>
+      <select1 ref="/pregnancy_home_visit/danger_signs/vaginal_bleeding">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/vaginal_bleeding:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/vaginal_bleeding/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/vaginal_bleeding/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/fits">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fits:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fits/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fits/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/severe_abdominal_pain">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_abdominal_pain:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_abdominal_pain/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_abdominal_pain/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/severe_headache">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_headache:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_headache/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/severe_headache/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/very_pale">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/very_pale:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/very_pale/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/very_pale/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/fever">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fever:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fever/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/fever/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/reduced_or_no_fetal_movements/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/breaking_water">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breaking_water:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breaking_water/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breaking_water/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/easily_tired">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/easily_tired:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/easily_tired/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/easily_tired/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/face_hand_swelling">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/face_hand_swelling:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/face_hand_swelling/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/face_hand_swelling/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <select1 ref="/pregnancy_home_visit/danger_signs/breathlessness">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breathlessness:label')"/>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breathlessness/yes:label')"/>
+          <value>yes</value>
+        </item>
+        <item>
+          <label ref="jr:itext('/pregnancy_home_visit/danger_signs/breathlessness/no:label')"/>
+          <value>no</value>
+        </item>
+      </select1>
+      <input ref="/pregnancy_home_visit/danger_signs/congratulate_no_ds_note">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/congratulate_no_ds_note:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/danger_signs/refer_patient_note_1">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/refer_patient_note_1:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/danger_signs/refer_patient_note_2">
+        <label ref="jr:itext('/pregnancy_home_visit/danger_signs/refer_patient_note_2:label')"/>
+      </input>
+    </group>
+    <group ref="/pregnancy_home_visit/safe_pregnancy_practices">
+      <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices:label')"/>
+      <group appearance="field-list" ref="/pregnancy_home_visit/safe_pregnancy_practices/malaria">
+        <select1 ref="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_use/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_advice_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/malaria/llin_advice_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/malaria/malaria_prophylaxis_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/malaria/malaria_prophylaxis_note:label')"/>
+        </input>
+      </group>
+      <group appearance="field-list" ref="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate">
+        <select1 ref="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_daily/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/iron_folate/iron_folate_note:label')"/>
+        </input>
+      </group>
+      <group appearance="field-list" ref="/pregnancy_home_visit/safe_pregnancy_practices/deworming">
+        <select1 ref="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/deworming/deworming_med_note:label')"/>
+        </input>
+      </group>
+      <group ref="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips">
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/eat_more_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/eat_more_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/talk_softly_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/talk_softly_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/respond_move_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/respond_move_note:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/deliver_hf_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/safe_practices_tips/deliver_hf_note:label')"/>
+        </input>
+      </group>
+      <group appearance="field-list" ref="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status">
+        <select1 ref="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_tested/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_importance_note">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/hiv_status/hiv_importance_note:label')"/>
+        </input>
+      </group>
+      <group appearance="field-list" ref="/pregnancy_home_visit/safe_pregnancy_practices/tetanus">
+        <select1 ref="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received:label')"/>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received/yes:label')"/>
+            <value>yes</value>
+          </item>
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_imm_received/no:label')"/>
+            <value>no</value>
+          </item>
+        </select1>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_1">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_1:label')"/>
+        </input>
+        <input ref="/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_2">
+          <label ref="jr:itext('/pregnancy_home_visit/safe_pregnancy_practices/tetanus/tt_note_2:label')"/>
+        </input>
+      </group>
+    </group>
+    <group appearance="field-list summary" ref="/pregnancy_home_visit/summary">
+      <input ref="/pregnancy_home_visit/summary/r_submit_note">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_submit_note:label')"/>
+      </input>
+      <input appearance="h1 yellow" ref="/pregnancy_home_visit/summary/r_summary_details">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_summary_details:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_patient_details">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_patient_details:label')"/>
+      </input>
+      <input appearance="h1 blue" ref="/pregnancy_home_visit/summary/r_summary">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_summary:label')"/>
+      </input>
+      <input appearance="center" ref="/pregnancy_home_visit/summary/r_pregnancy_details">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_pregnancy_details:label')"/>
+      </input>
+      <input appearance="center" ref="/pregnancy_home_visit/summary/r_pregnancy_details_unknown">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_pregnancy_details_unknown:label')"/>
+      </input>
+      <input appearance="h3 blue center underline" ref="/pregnancy_home_visit/summary/r_risk_factors">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_factors:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_risk_heart_condition">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_heart_condition:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_risk_asthma">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_asthma:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_risk_high_blood_pressure">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_high_blood_pressure:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_risk_diabetes">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_diabetes:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_risk_additional">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_risk_additional:label')"/>
+      </input>
+      <input appearance="h3 blue center underline" ref="/pregnancy_home_visit/summary/r_danger_signs">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_signs:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_vaginal_bleeding">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_vaginal_bleeding:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_fits">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_fits:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_severe_abdominal_pain">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_severe_abdominal_pain:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_severe_headache">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_severe_headache:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_very_pale">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_very_pale:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_fever">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_fever:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_reduced_or_no_fetal_movements">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_reduced_or_no_fetal_movements:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_breaking_water">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_breaking_water:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_easily_tired">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_easily_tired:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_face_hand_swelling">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_face_hand_swelling:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_danger_sign_breathlessness">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_danger_sign_breathlessness:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_space_1"/>
+      <input appearance="h1 lime" ref="/pregnancy_home_visit/summary/r_referrals">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_referrals:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_refer_clinic_immediately">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_refer_clinic_immediately:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_refer_danger_sign">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_refer_danger_sign:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_routine_anc">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_routine_anc:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_request_services">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_request_services:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_request_service_tt">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_request_service_tt:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_request_service_hiv_test">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_request_service_hiv_test:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_request_service_deworming">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_request_service_deworming:label')"/>
+      </input>
+      <input appearance="li" ref="/pregnancy_home_visit/summary/r_request_service_iron">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_request_service_iron:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_who_recommends">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_who_recommends:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_refer_hf_appropriate_time">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_refer_hf_appropriate_time:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_refer_hf_immediately">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_refer_hf_immediately:label')"/>
+      </input>
+      <input appearance="h1 green" ref="/pregnancy_home_visit/summary/r_follow_up_tasks">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_follow_up_tasks:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_following_tasks">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_following_tasks:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_fup_danger_sign">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_fup_danger_sign:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_fup_hf_visit">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_fup_hf_visit:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_fup_pregnancy_visit">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_fup_pregnancy_visit:label')"/>
+      </input>
+      <input ref="/pregnancy_home_visit/summary/r_fup_pregnancy_visit_2_weeks">
+        <label ref="jr:itext('/pregnancy_home_visit/summary/r_fup_pregnancy_visit_2_weeks:label')"/>
+      </input>
+      <group appearance="hidden" ref="/pregnancy_home_visit/summary/custom_translations">
+        <select1 ref="/pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator">
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/summary/custom_translations/custom_woman_label_translator/woman:label')"/>
+            <value>woman</value>
+          </item>
+        </select1>
+        <select1 ref="/pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator">
+          <item>
+            <label ref="jr:itext('/pregnancy_home_visit/summary/custom_translations/custom_woman_start_label_translator/woman-start:label')"/>
+            <value>woman-start</value>
+          </item>
+        </select1>
+      </group>
+    </group>
+    <group appearance="hidden" ref="/pregnancy_home_visit/data">
+      <group ref="/pregnancy_home_visit/data/meta"/>
+    </group>
+  </h:body>
+</h:html>
diff --git a/tests/e2e/visual/contacts/list-view-login-visual.wdio-spec.js b/tests/e2e/visual/contacts/list-view-login-visual.wdio-spec.js
index a6925ca6fd4..9b0d0e13288 100644
--- a/tests/e2e/visual/contacts/list-view-login-visual.wdio-spec.js
+++ b/tests/e2e/visual/contacts/list-view-login-visual.wdio-spec.js
@@ -3,21 +3,12 @@ const contactPage = require('@page-objects/default/contacts/contacts.wdio.page')
 const loginPage = require('@page-objects/default/login/login.wdio.page');
 const dataFactory = require('@factories/cht/generate');
 const reportsPage = require('@page-objects/default/reports/reports.wdio.page');
+const searchPage = require('@page-objects/default/search/search.wdio.page');
 const utils = require('@utils');
 
 const { resizeWindowForScreenshots, generateScreenshot } = require('@utils/screenshots');
 
 describe('Contact List Page', () => {
-  const updateRolePermissions = async (roleValue, addPermissions, removePermissions = []) => {
-    const roles = [roleValue];
-    const settings = await utils.getSettings();
-    const permissions = await utils.getUpdatedPermissions(roles, addPermissions, removePermissions);
-    await utils.updateSettings(
-      { roles: settings.roles, permissions },
-      { revert: true, ignoreReload: true, refresh: true, sync: true }
-    );
-  };
-
   const docs = dataFactory.createHierarchy({
     name: 'Janet Mwangi',
     user: true,
@@ -45,89 +36,101 @@ describe('Contact List Page', () => {
     await commonPage.logout();
   });
 
-  describe('Log in', () => {
-    it('should show contacts page tab '+
-      'when can_view_contact and can_view_contacts_tab permissions are enabled', async () => {
-      await (await commonPage.contactsTab()).waitForDisplayed();
-      await generateScreenshot('contact-page', 'tab-visible');
-      await commonPage.openHamburgerMenu();
-      await generateScreenshot('contact-page', 'menu-opened');
-      await commonPage.closeHamburgerMenu();
-      await commonPage.goToPeople();
-      expect(await commonPage.isPeopleListPresent()).to.be.true;
-      await generateScreenshot('contact-page', 'people-list-visible');
-      await commonPage.goToReports();
-      await reportsPage.openFirstReport();
-      await reportsPage.rightPanelSelectors.patientName().waitForClickable();
-      await generateScreenshot('contact-page', 'reports-visible');
-      await reportsPage.rightPanelSelectors.patientName().click();
-      await contactPage.waitForContactLoaded();
-      await generateScreenshot('contact-page', 'contact-loaded');
-      await commonPage.goToMessages();
-    });
+  it('should show contacts page tab '+
+    'when can_view_contact and can_view_contacts_tab permissions are enabled', async () => {
+    expect(await commonPage.isContactTabPresent()).to.be.true;
+    await generateScreenshot('contact-page', 'tab-visible');
+    await commonPage.openHamburgerMenu();
+    await generateScreenshot('contact-page', 'menu-opened');
+    await commonPage.closeHamburgerMenu();
+    await commonPage.goToPeople();
+    expect(await commonPage.isPeopleListPresent()).to.be.true;
+    await generateScreenshot('contact-page', 'people-list-visible');
+    await commonPage.goToReports();
+    await searchPage.performSearch('Amanda Allen');
+    await commonPage.waitForLoaders();
+    await reportsPage.openFirstReport();
+    await reportsPage.rightPanelSelectors.patientName().waitForClickable();
+    await generateScreenshot('contact-page', 'reports-visible');
+    await reportsPage.rightPanelSelectors.patientName().click();
+    await contactPage.waitForContactLoaded();
+    await generateScreenshot('contact-page', 'contact-loaded');
+    await commonPage.goToMessages();
+  });
 
-    it('should hide contacts page as tab and from menu option ' +
-      'when can_view_contacts_tab permissions is enable but can_view_contact permission is not', async () => {
-      await updateRolePermissions('chw', [], ['can_view_contacts']);
-      await commonPage.waitForPageLoaded();
-      await commonPage.goToMessages();
-      await (await commonPage.contactsTab()).waitForDisplayed({ reverse: true });
-      await generateScreenshot('contact-page', 'no-tab-visible');
-      await commonPage.openHamburgerMenu();
-      await (await commonPage.contactsButton()).waitForClickable({ reverse: true });
-      await generateScreenshot('contact-page', 'no-menu-option');
-      await commonPage.closeHamburgerMenu();
-      await commonPage.goToReports();
-      await reportsPage.openFirstReport();
-      await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
-      await generateScreenshot('contact-page', 'report-view-no-contacts');
-      await reportsPage.rightPanelSelectors.patientName().click();
-      await generateScreenshot('contact-page', 'report-no-contact-loaded');
-      await commonPage.goToMessages();
+  it('should hide contacts page as tab and from menu option ' +
+    'when can_view_contacts_tab permissions is enable but can_view_contact permission is not', async () => {
+    await utils.updatePermissions(docs.user.roles, [], ['can_view_contacts'], {
+      ignoreReload: true,
+      revert: true,
+      refresh: true,
+      sync: true
     });
+    await commonPage.waitForPageLoaded();
+    await commonPage.goToMessages();
+    expect(await commonPage.isContactTabPresent()).to.be.false;
+    await generateScreenshot('contact-page', 'no-tab-visible');
+    await commonPage.toggleMenuAndCaptureScreenshot('People', true, 'contact-page', 'no-menu-option');
+    await commonPage.goToReports();
+    await searchPage.performSearch('Amanda Allen');
+    await commonPage.waitForLoaders();
+    await reportsPage.openFirstReport();
+    await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
+    await generateScreenshot('contact-page', 'report-view-no-contacts');
+    await reportsPage.rightPanelSelectors.patientName().click();
+    await generateScreenshot('contact-page', 'report-no-contact-loaded');
+    await commonPage.goToMessages();
+  });
 
-    it('should hide contacts page as tab, show from menu option ' +
-      'when can_view_contact permissions is enable but can_view_contact permission is not', async () => {
-      await updateRolePermissions('chw', ['can_view_contacts'], ['can_view_contacts_tab']);
-      await commonPage.waitForPageLoaded();
-      await commonPage.goToMessages();
-      await (await commonPage.contactsTab()).waitForDisplayed({ reverse: true });
-      await generateScreenshot('contact-page', 'no-tab-visible');
-      await commonPage.openHamburgerMenu();
-      await (await commonPage.contactsButton()).waitForClickable();
-      await generateScreenshot('contact-page', 'menu-option-visible');
-      await (await commonPage.contactsButton()).click();
-      expect(await commonPage.isPeopleListPresent()).to.be.true;
-      await commonPage.waitForPageLoaded();
-      await generateScreenshot('contact-page', 'contacts-in-people-list');
-      await commonPage.goToReports();
-      await reportsPage.openFirstReport();
-      await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
-      await generateScreenshot('contact-page', 'report-view-with-contacts');
-      await reportsPage.rightPanelSelectors.patientName().click();
-      await contactPage.waitForContactLoaded();
-      await generateScreenshot('contact-page', 'report-contact-loaded');
-      await commonPage.goToMessages();
+  it('should hide contacts page as tab, show from menu option ' +
+    'when can_view_contact permissions is enable but can_view_contact permission is not', async () => {
+    await utils.updatePermissions(docs.user.roles, ['can_view_contacts'], ['can_view_contacts_tab'], {
+      ignoreReload: true,
+      revert: true,
+      refresh: true,
+      sync: true
     });
+    await commonPage.waitForPageLoaded();
+    await commonPage.goToMessages();
+    expect(await commonPage.isContactTabPresent()).to.be.false;
+    await generateScreenshot('contact-page', 'no-tab-visible');
+    await commonPage.toggleMenuAndCaptureScreenshot('People', false, 'contact-page', 'menu-option-visible');
+    expect(await commonPage.isPeopleListPresent()).to.be.true;
+    await commonPage.waitForPageLoaded();
+    await generateScreenshot('contact-page', 'contacts-in-people-list');
+    await commonPage.goToReports();
+    await searchPage.performSearch('Amanda Allen');
+    await commonPage.waitForLoaders();
+    await reportsPage.openFirstReport();
+    await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
+    await generateScreenshot('contact-page', 'report-view-with-contacts');
+    await reportsPage.rightPanelSelectors.patientName().click();
+    await contactPage.waitForContactLoaded();
+    await generateScreenshot('contact-page', 'report-contact-loaded');
+    await commonPage.goToMessages();
+  });
 
-    it('should hide contacts page as a tab and from menu option ' +
-      'when can_view_contact and can_view_contact permissions are disable', async () => {
-      await updateRolePermissions('chw', [], ['can_view_contacts_tab', 'can_view_contacts']);
-      await commonPage.waitForPageLoaded();
-      await commonPage.goToMessages();
-      await (await commonPage.contactsTab()).waitForDisplayed({ reverse: true });
-      await generateScreenshot('contact-page', 'no-tab-visible-oPerms');
-      await commonPage.openHamburgerMenu();
-      await (await commonPage.contactsButton()).waitForClickable({ reverse: true });
-      await generateScreenshot('contact-page', 'no-menu-option-no-Perms');
-      await commonPage.closeHamburgerMenu();
-      await commonPage.goToReports();
-      await reportsPage.openFirstReport();
-      await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
-      await generateScreenshot('contact-page', 'report-view-no-contacts-no-perms');
-      await reportsPage.rightPanelSelectors.patientName().click();
-      await generateScreenshot('contact-page', 'report-no-contact-loaded-no-perms');
-      await commonPage.goToMessages();
+  it('should hide contacts page as a tab and from menu option ' +
+    'when can_view_contact and can_view_contact permissions are disable', async () => {
+    await utils.updatePermissions(docs.user.roles, [], ['can_view_contacts_tab', 'can_view_contacts'], {
+      ignoreReload: true,
+      revert: true,
+      refresh: true,
+      sync: true
     });
+    await commonPage.waitForPageLoaded();
+    await commonPage.goToMessages();
+    expect(await commonPage.isContactTabPresent()).to.be.false;
+    await generateScreenshot('contact-page', 'no-tab-visible-oPerms');
+    await commonPage.toggleMenuAndCaptureScreenshot('People', true, 'contact-page', 'no-menu-option-no-Perms');
+    await commonPage.goToReports();
+    await searchPage.performSearch('Amanda Allen');
+    await commonPage.waitForLoaders();
+    await reportsPage.openFirstReport();
+    await (reportsPage.rightPanelSelectors.patientName()).waitForClickable();
+    await generateScreenshot('contact-page', 'report-view-no-contacts-no-perms');
+    await reportsPage.rightPanelSelectors.patientName().click();
+    await generateScreenshot('contact-page', 'report-no-contact-loaded-no-perms');
+    await commonPage.goToMessages();
   });
 });
diff --git a/tests/e2e/visual/wdio.conf.js b/tests/e2e/visual/wdio.conf.js
index 1ba9009f00a..69af6994252 100644
--- a/tests/e2e/visual/wdio.conf.js
+++ b/tests/e2e/visual/wdio.conf.js
@@ -1,4 +1,5 @@
 const wdioBaseConfig = require('../../wdio.conf');
+const { resizeWindowForScreenshots } = require('@utils/screenshots');
 
 const chai = require('chai');
 chai.use(require('chai-exclude'));
@@ -9,9 +10,9 @@ const mobileCapability = {
     ...wdioBaseConfig.config.capabilities[0]['goog:chromeOptions'],
     args: [
       ...wdioBaseConfig.config.capabilities[0]['goog:chromeOptions'].args,
-      'window-size=450,700',
+      'window-size=375,850',
     ],
-  },
+  }
 };
 
 const desktopCapability = {
@@ -20,17 +21,27 @@ const desktopCapability = {
     ...wdioBaseConfig.config.capabilities[0]['goog:chromeOptions'],
     args: [
       ...wdioBaseConfig.config.capabilities[0]['goog:chromeOptions'].args,
-      'window-size=1000,800',
+      'window-size=1440, 1024',
     ],
-  },
+  }
 };
 
 exports.config = Object.assign(wdioBaseConfig.config, {
   suites: {
-    all: [
-      './**/*.wdio-spec.js',
+    desktopTests: [
+      'contacts/contact-user-management.wdio-spec.js',
+      'contacts/contact-user-hierarchy-creation.wdio-spec.js',
+    ],
+    mobileTests: [
+      'contacts/contact-user-management.wdio-spec.js',
+      'contacts/list-view-login-visual.wdio-spec.js',
     ]
   },
-  capabilities: [mobileCapability, desktopCapability],
+  capabilities: process.argv.includes('--suite=mobileTests')
+    ? [mobileCapability]
+    : [desktopCapability],
   maxInstances: 1,
+  beforeSuite: async function () {
+    await resizeWindowForScreenshots();
+  },
 });
diff --git a/tests/factories/cht/generate.js b/tests/factories/cht/generate.js
index 86ebbac7d13..cd73edd2c2e 100644
--- a/tests/factories/cht/generate.js
+++ b/tests/factories/cht/generate.js
@@ -4,10 +4,22 @@ const personFactory = require('@factories/cht/contacts/person');
 const deliveryFactory = require('@factories/cht/reports/delivery');
 const pregnancyFactory = require('@factories/cht/reports/pregnancy');
 const pregnancyVisitFactory = require('@factories/cht/reports/pregnancy-visit');
+const immunizationFactory = require('@factories/cht/reports/inmunization');
+const { faker } = require('@faker-js/faker');
 
 // Fixed collection of real-world data
-const FIRST_NAMES = ['Amanda', 'Beatrice', 'Dana', 'Fatima', 'Gina', 'Helen', 'Isabelle', 'Jessica', 'Ivy', 'Sara'];
-const LAST_NAMES = ['Allen', 'Bass', 'Dearborn', 'Flair', 'Gorman', 'Hamburg', 'Ivanas', 'James', 'Moore', 'Taylor'];
+const PRIMARY_CONTACT_FIRST_NAMES = [
+  'Amanda', 'Beatrice', 'Dana', 'Fatima',
+  'Gina', 'Helen', 'Isabelle', 'Jessica',
+  'Ivy', 'Sara'
+];
+const ADDITIONAL_KID_FIRST_NAMES = ['John', 'Timmy', 'Elias'];
+const ADDITIONAL_WOMAN_FIRST_NAMES = ['Hawa', 'Ana', 'Tania'];
+const FAMILY_LAST_NAMES = [
+  'Allen', 'Bass', 'Dearborn', 'Flair',
+  'Gorman', 'Hamburg', 'Ivanas', 'James',
+  'Moore', 'Taylor'
+];
 const PHONE_NUMBERS = [
   '+256414345783', '+256414345784', '+256414345785',
   '+256414345786', '+256414345787', '+256414345788',
@@ -16,12 +28,37 @@ const PHONE_NUMBERS = [
 ];
 const PATIENT_IDS = [65421, 65422, 65423, 65424, 65425, 65426, 65427, 65428, 65429, 65430];
 
+const calculateDateOfBirth = (age) => {
+  const today = new Date();
+  const birthYear = today.getFullYear() - age;
+  const birthMonth = today.getMonth() + 1;
+  const birthDay = today.getDate();
+  return `${birthYear}-${String(birthMonth).padStart(2, '0')}-${String(birthDay).padStart(2, '0')}`;
+};
+const KIDS_AGES = [2, 7, 10];
+const ADULTS_AGES = [25, 35];
+const DATE_OF_BIRTHS_KIDS = KIDS_AGES.map(calculateDateOfBirth);
+const DATE_OF_BIRTHS_ADULTS = ADULTS_AGES.map(calculateDateOfBirth);
+
+const calculateLastMenstrualPeriod = (date) => {
+  const PREGNANCY_DAYS = 252;
+  date.setDate(date.getDate() - PREGNANCY_DAYS);
+  return date.toISOString().split('T')[0]; // YYYY-MM-DD
+};
+
 const getReportContext = (patient, submitter) => {
+  const daysAgo = faker.number.int({ min: 1, max: 10 });
+  const currentDate = new Date();
+  currentDate.setDate(currentDate.getDate() - daysAgo);
+  const lastMestrualPeriod = calculateLastMenstrualPeriod(new Date());
   const context = {
     fields: {
       patient_id: patient._id,
       patient_uuid: patient._id,
       patient_name: patient.name,
+      visited_contact_uuid: patient.parent._id,
+      visited_date: currentDate,
+      lmp_date_8601: lastMestrualPeriod,
     },
   };
   if (submitter) {
@@ -61,20 +98,22 @@ const createDataWithFixedData = ({ healthCenter, user, nbrClinics = 10, nbrPerso
 };
 
 const createClinic = (index, healthCenter) => {
-  const firstName = FIRST_NAMES[index % FIRST_NAMES.length];
-  const lastName = LAST_NAMES[index % LAST_NAMES.length];
+  const firstName = PRIMARY_CONTACT_FIRST_NAMES[index % PRIMARY_CONTACT_FIRST_NAMES.length];
+  const lastName = FAMILY_LAST_NAMES[index % FAMILY_LAST_NAMES.length];
   const personName = `${firstName} ${lastName}`;
   const personPhoneNumber = PHONE_NUMBERS[index % PHONE_NUMBERS.length];
 
   const primaryContact = personFactory.build({
     name: personName,
-    phone: personPhoneNumber
+    phone: personPhoneNumber,
+    patient_id: PATIENT_IDS[0],
   });
 
   const clinic = placeFactory.place().build({
     type: 'clinic',
     parent: { _id: healthCenter._id, parent: healthCenter.parent },
     name: `${personName} Family`,
+    last_name: lastName,
     contact: primaryContact
   });
 
@@ -83,26 +122,51 @@ const createClinic = (index, healthCenter) => {
   return { clinic, primaryContact };
 };
 
-const createAdditionalPersons = (nbrPersons, clinic) => {
+const createAdditionalPersons = (nbrPersons, clinic, nameList, dateOfBirthList) => {
   return Array
-    .from({ length: nbrPersons - 1 })
+    .from({ length: nbrPersons })
     .map((_, i) => {
-      const additionalPersonName = `${FIRST_NAMES[i % FIRST_NAMES.length]} ${LAST_NAMES[i % LAST_NAMES.length]}`;
       const additionalPhoneNumber = PHONE_NUMBERS[i % PHONE_NUMBERS.length];
+      const name = nameList[i % nameList.length];
+      const date_of_birth = dateOfBirthList[i % dateOfBirthList.length];
       return personFactory.build({
         parent: { _id: clinic._id, parent: clinic.parent },
-        name: additionalPersonName,
+        name: `${name} ${clinic.last_name}`,
         patient_id: PATIENT_IDS[i % PATIENT_IDS.length],
-        phone: additionalPhoneNumber
+        phone: additionalPhoneNumber,
+        date_of_birth: date_of_birth,
       });
     });
 };
 
-const createReportsForPerson = (person, user) => {
+const createAdditionalKid = (nbrPersons, clinic) => {
+  return createAdditionalPersons(
+    nbrPersons,
+    clinic,
+    ADDITIONAL_KID_FIRST_NAMES,
+    DATE_OF_BIRTHS_KIDS
+  );
+};
+
+const createAdditionalWoman = (nbrPersons, clinic) => {
+  return createAdditionalPersons(
+    nbrPersons,
+    clinic,
+    ADDITIONAL_WOMAN_FIRST_NAMES,
+    DATE_OF_BIRTHS_ADULTS,
+  );
+};
+
+const createReportsForWoman = (person, user) => {
   return [
-    deliveryFactory.build(getReportContext(person, user)),
     pregnancyFactory.build(getReportContext(person, user)),
-    pregnancyVisitFactory.build(getReportContext(person, user))
+    pregnancyVisitFactory.build(getReportContext(person, user)),
+  ];
+};
+
+const createReportsForKid = (person, user) => {
+  return [
+    immunizationFactory.build({ contact: user, patient: person })
   ];
 };
 
@@ -112,19 +176,28 @@ const createDataWithRealNames = ({ healthCenter, user, nbrClinics = 10, nbrPerso
     .map((_, index) => {
       const { clinic, primaryContact } = createClinic(index, healthCenter);
 
-      const additionalPersons = createAdditionalPersons(nbrPersons, clinic);
-
-      const allPersons = [primaryContact, ...additionalPersons];
+      const kids = createAdditionalKid( Math.floor(nbrPersons / 2), clinic);
+      const adults = createAdditionalWoman( Math.floor(nbrPersons / 2), clinic);
+      adults.unshift(primaryContact);
 
-      return { clinic, persons: allPersons };
+      return { clinic, kids, adults };
     });
 
-  const allPersons = clinicsData.flatMap(data => data.persons);
+  const allPersons = clinicsData.flatMap(data => ([...data.kids, ...data.adults]));
   const clinicList = clinicsData.map(data => data.clinic);
 
-  const reports = allPersons.flatMap(person => createReportsForPerson(person, user));
+  const reportsForKids = clinicsData
+    .flatMap(data => data.kids)
+    .flatMap(person => createReportsForKid(person, user));
+  const reportsForWoman = clinicsData
+    .flatMap(data => data.adults)
+    .flatMap(person => createReportsForWoman(person, user));
 
-  return { clinics: clinicList, reports, persons: allPersons };
+  return {
+    clinics: clinicList,
+    reports: [...reportsForKids, ...reportsForWoman],
+    persons: [...allPersons]
+  };
 };
 
 const createData = ({ healthCenter, user, nbrClinics, nbrPersons, useRealNames = false }) => {
@@ -137,14 +210,31 @@ const createData = ({ healthCenter, user, nbrClinics, nbrPersons, useRealNames =
 const createHierarchy = ({ name, user = false, nbrClinics = 50, nbrPersons = 10, useRealNames = false }) => {
   const hierarchy = placeFactory.generateHierarchy();
   const healthCenter = hierarchy.get('health_center');
-  user = user && userFactory.build({ place: healthCenter._id, roles: ['chw'] });
+  healthCenter.name = `${name}'s Area`;
+  const branch = hierarchy.get('district_hospital');
+  branch.name = 'Kiambu Branch';
+  const branchContact = {
+    _id: 'fixture:user:user2',
+    name: 'Manager Ann',
+    phone: '+123456789'
+  };
+  branch.contact = branchContact;
+  const contact = {
+    _id: 'fixture:user:user1',
+    name: name,
+    phone: '+12068881234'
+  };
+  healthCenter.contact = contact;
+
+  user = user && userFactory.build({ place: healthCenter._id, roles: ['chw'], contact: contact });
 
   const places = [...hierarchy.values()].map(place => {
-    place.name = `${name} ${place.type}`;
+    if (place.type === 'clinic') {
+      place.name = `${name} ${place.type}`;
+    }
     return place;
   });
 
-  healthCenter.name = `${name}'s Area`;
   const { clinics, reports, persons } = createData({ healthCenter, nbrClinics, nbrPersons, user, useRealNames });
 
   return {
@@ -161,4 +251,5 @@ module.exports = {
   createHierarchy,
   createData,
   ids: docs => docs.map(doc => doc._id || doc.id),
+  PATIENT_IDS,
 };
diff --git a/tests/factories/cht/reports/inmunization.js b/tests/factories/cht/reports/inmunization.js
new file mode 100644
index 00000000000..0d3a3a17333
--- /dev/null
+++ b/tests/factories/cht/reports/inmunization.js
@@ -0,0 +1,73 @@
+const { v4: uuidv4 } = require('uuid');
+
+const immunizationVisitFactory = {
+  build: ({ contact, patient }) => ({
+    _id: uuidv4(),
+    form: 'immunization_visit',
+    type: 'data_record',
+    content_type: 'xml',
+    reported_date: Date.now(),
+    contact: contact,
+    fields: {
+      inputs: {
+        source: 'contact',
+        contact: {
+          _id: patient._id,
+          patient_id: patient.patient_id,
+          name: patient.name,
+          date_of_birth: patient.date_of_birth,
+          sex: patient.sex,
+          phone: patient.phone,
+          parent: {
+            contact: {
+              name: patient.name
+            }
+          }
+        }
+      },
+      patient_age_in_years: '2',
+      patient_phone: patient.phone || '',
+      patient_uuid: patient._id,
+      patient_id: patient.patient_id,
+      patient_name: patient.name,
+      chw_name: patient.name,
+      chw_sms: `Nice work`,
+      visit_confirmed: 'yes',
+      vaccines_received: {
+        received_flu: 'yes'
+      },
+      group_select_vaccines: {
+        g_vaccines: 'flu'
+      },
+      group_flu: {
+        g_flu: 'yes'
+      },
+      group_note: {
+        default_chw_sms: 'default',
+        default_chw_sms_text: `Nice work`,
+        is_sms_edited: 'yes'
+      },
+      group_review: {
+        r_patient_id: patient.patient_id
+      },
+      meta: {
+        instanceID: `uuid:${uuidv4()}`
+      }
+    },
+    geolocation_log: [
+      {
+        timestamp: Date.now(),
+        recording: {
+          code: 1,
+          message: 'User denied Geolocation'
+        }
+      }
+    ],
+    geolocation: {
+      code: 1,
+      message: 'User denied Geolocation'
+    }
+  })
+};
+
+module.exports = immunizationVisitFactory;
diff --git a/tests/integration/.mocharc-base.js b/tests/integration/.mocharc-base.js
index 99223dd2f61..068a4b04fb7 100644
--- a/tests/integration/.mocharc-base.js
+++ b/tests/integration/.mocharc-base.js
@@ -7,7 +7,9 @@ const deepEqualInAnyOrder = require('deep-equal-in-any-order');
 chai.use(chaiExclude);
 chai.use(chaiAsPromised);
 chai.use(deepEqualInAnyOrder);
+chai.use(require('chai-shallow-deep-equal'));
 global.expect = chai.expect;
+global.chai = chai;
 
 module.exports = {
   allowUncaught: false,
diff --git a/tests/integration/api/controllers/all-docs.spec.js b/tests/integration/api/controllers/all-docs.spec.js
index f67f88b71cd..3df2c65bbd8 100644
--- a/tests/integration/api/controllers/all-docs.spec.js
+++ b/tests/integration/api/controllers/all-docs.spec.js
@@ -206,7 +206,6 @@ describe('all_docs handler', () => {
     const request = {
       method: 'POST',
       body: { keys },
-      headers: { 'Content-Type': 'application/json' }
     };
 
     return utils
diff --git a/tests/integration/api/controllers/bulk-docs.spec.js b/tests/integration/api/controllers/bulk-docs.spec.js
index fa3b4376054..10cf7bb7fc6 100644
--- a/tests/integration/api/controllers/bulk-docs.spec.js
+++ b/tests/integration/api/controllers/bulk-docs.spec.js
@@ -84,7 +84,7 @@ describe('bulk-docs handler', () => {
   before(async () => {
     await utils.saveDoc(parentPlace);
     await sUtils.waitForSentinel();
-    await utils.updatePermissions(['district_admin'], ['can_have_multiple_places'], [], true);
+    await utils.updatePermissions(['district_admin'], ['can_have_multiple_places'], [], { ignoreReload: true });
     await utils.createUsers(users);
   });
 
@@ -286,13 +286,13 @@ describe('bulk-docs handler', () => {
           }).then(result => {
             chai.expect(result.length).to.equal(8);
             chai.expect(result[0]).excluding('_rev').to.deep.equal(docs[0]);
-            chai.expect(result[1]).to.deep.nested.include({ 'responseBody.error': 'not_found' });
+            chai.expect(result[1]).to.deep.nested.include({ 'body.error': 'not_found' });
             chai.expect(result[2]).excluding('_rev').to.deep.equal(existentDocs[2]);
             chai.expect(result[3]).excluding('_rev').to.deep.equal(existentDocs[3]);
             chai.expect(result[4]).excluding('_rev').to.deep.equal(existentDocs[0]);
 
             chai.expect(result[5]).excluding('_rev').to.deep.equal(docs[5]);
-            chai.expect(result[6]).to.deep.nested.include({ 'responseBody.error': 'not_found' });
+            chai.expect(result[6]).to.deep.nested.include({ 'body.error': 'not_found' });
             chai.expect(result[7]).excluding( ['_rev', '_id']).to.deep.equal(docs[7]);
 
             return sUtils.waitForSentinel(ids).then(() => sUtils.getInfoDocs(ids));
@@ -757,12 +757,12 @@ describe('bulk-docs handler', () => {
         chai.expect(results.length).to.equal(8);
 
         chai.expect(results[0]).excluding('_rev').to.deep.equal(docs[0]);
-        chai.expect(results[1]).to.deep.nested.include({ 'responseBody.error': 'not_found' });
+        chai.expect(results[1]).to.deep.nested.include({ 'body.error': 'not_found' });
         chai.expect(results[2]).excluding('_rev').to.deep.equal(existentDocs[2]);
         chai.expect(results[3]).excluding('_rev').to.deep.equal(existentDocs[3]);
         chai.expect(results[4]).excluding('_rev').to.deep.equal(existentDocs[0]);
         chai.expect(results[5]).excluding('_rev').to.deep.equal(docs[5]);
-        chai.expect(results[6]).to.deep.nested.include({ 'responseBody.error': 'not_found' });
+        chai.expect(results[6]).to.deep.nested.include({ 'body.error': 'not_found' });
         chai.expect(results[7]).excluding(['_rev', '_id']).to.deep.equal(docs[7]);
       });
   });
@@ -804,7 +804,7 @@ describe('bulk-docs handler', () => {
           chai.expect(result[0]).to.include({ id: 'denied_report', error: 'forbidden' });
         } else {
           // CouchDB interprets this as an attachment POST request
-          chai.expect(result).to.deep.nested.include({ 'responseBody.error': 'method_not_allowed' });
+          chai.expect(result).to.deep.nested.include({ 'body.error': 'method_not_allowed' });
         }
       });
     });
@@ -862,9 +862,9 @@ describe('bulk-docs handler', () => {
       })
       .then(results => {
         chai.expect(results[0]).to.deep.equal(docs[0]);
-        chai.expect(results[1]).to.include({ statusCode: 404 });
+        chai.expect(results[1]).to.include({ status: 404 });
         chai.expect(results[2]).to.deep.equal(docs[2]);
-        chai.expect(results[3]).to.include({ statusCode: 404 });
+        chai.expect(results[3]).to.include({ status: 404 });
       });
   });
 
diff --git a/tests/integration/api/controllers/bulk-get.spec.js b/tests/integration/api/controllers/bulk-get.spec.js
index cc23e31f647..d8d60701217 100644
--- a/tests/integration/api/controllers/bulk-get.spec.js
+++ b/tests/integration/api/controllers/bulk-get.spec.js
@@ -504,7 +504,7 @@ describe('bulk-get handler', () => {
           if (result.results) {
             chai.expect(result.results.length).to.equal(0);
           } else {
-            chai.expect(result.responseBody).to.equal('Server error');
+            chai.expect(result.body).to.equal('Server error');
           }
         });
       });
diff --git a/tests/integration/api/controllers/changes.spec.js b/tests/integration/api/controllers/changes.spec.js
index 9daab7da414..1c6d2791c32 100644
--- a/tests/integration/api/controllers/changes.spec.js
+++ b/tests/integration/api/controllers/changes.spec.js
@@ -214,8 +214,8 @@ describe('changes handler', () => {
         })
         .then(response => {
           expect(response.headers).to.be.ok;
-          expect(response.headers['content-type']).to.equal('application/json');
-          expect(response.headers.server).to.be.ok;
+          expect(response.headers.get('content-type')).to.equal('application/json');
+          expect(response.headers.get('server')).to.be.ok;
         });
     });
   });
@@ -316,7 +316,7 @@ describe('changes handler', () => {
             if (result.results) {
               return assertChangeIds(result, ...changesIDs, bobUserId);
             }
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.body.error).to.equal('forbidden');
           });
         });
     });
diff --git a/tests/integration/api/controllers/contacts-by-phone.spec.js b/tests/integration/api/controllers/contacts-by-phone.spec.js
index 286f3c9e616..3ead3ec99c3 100644
--- a/tests/integration/api/controllers/contacts-by-phone.spec.js
+++ b/tests/integration/api/controllers/contacts-by-phone.spec.js
@@ -185,8 +185,8 @@ describe('Contacts by phone API', () => {
         .request(noAuthRequestOptions)
         .then(() => chai.assert.fail('Should not allow unauthenticated requests'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(401);
-          chai.expect(err.error).to.deep.include({ code: 401, error: 'unauthorized' });
+          chai.expect(err.status).to.equal(401);
+          chai.expect(err.body).to.deep.include({ code: 401, error: 'unauthorized' });
         });
     });
 
@@ -197,8 +197,8 @@ describe('Contacts by phone API', () => {
         .request(noAuthRequestOptions)
         .then(() => chai.assert.fail('Should not allow unauthenticated requests'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(401);
-          chai.expect(err.error).to.deep.include({ code: 401, error: 'unauthorized' });
+          chai.expect(err.status).to.equal(401);
+          chai.expect(err.body).to.deep.include({ code: 401, error: 'unauthorized' });
         });
     });
   });
@@ -210,8 +210,8 @@ describe('Contacts by phone API', () => {
         .request(offlineRequestOptions)
         .then(() => chai.assert.fail('Should not allow offline users'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(403);
-          chai.expect(err.error).to.deep.include({ code: 403, error: 'forbidden' });
+          chai.expect(err.status).to.equal(403);
+          chai.expect(err.body).to.deep.include({ code: 403, error: 'forbidden' });
         });
     });
 
@@ -222,8 +222,8 @@ describe('Contacts by phone API', () => {
         .request(offlineRequestOptions)
         .then(() => chai.assert.fail('Should not allow offline users'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(403);
-          chai.expect(err.error).to.deep.include({ code: 403, error: 'forbidden' });
+          chai.expect(err.status).to.equal(403);
+          chai.expect(err.body).to.deep.include({ code: 403, error: 'forbidden' });
         });
     });
   });
@@ -234,8 +234,8 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`phone` parameter is required and must be a valid phone number'
           });
@@ -248,8 +248,8 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`phone` parameter is required and must be a valid phone number'
           });
@@ -284,7 +284,7 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should 404 when not found'))
         .catch(result => {
-          chai.expect(result.error).to.deep.equal({ error: 'not_found', reason: 'no matches found' });
+          chai.expect(result.body).to.deep.equal({ error: 'not_found', reason: 'no matches found' });
         });
     });
 
@@ -309,8 +309,8 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`phone` parameter is required and must be a valid phone number'
           });
@@ -323,8 +323,8 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail with incorrect params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`phone` parameter is required and must be a valid phone number'
           });
@@ -369,7 +369,7 @@ describe('Contacts by phone API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should 404 when not found'))
         .catch(result => {
-          chai.expect(result.error).to.deep.equal({ error: 'not_found', reason: 'no matches found' });
+          chai.expect(result.body).to.deep.equal({ error: 'not_found', reason: 'no matches found' });
         });
     });
 
diff --git a/tests/integration/api/controllers/db-doc.spec.js b/tests/integration/api/controllers/db-doc.spec.js
index 45b042fd03e..28bb8bca911 100644
--- a/tests/integration/api/controllers/db-doc.spec.js
+++ b/tests/integration/api/controllers/db-doc.spec.js
@@ -273,7 +273,7 @@ describe('db-doc handler', () => {
           return utils.getDoc('db_doc_delete');
         })
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('not_found');
+          chai.expect(err.body.error).to.equal('not_found');
         });
     });
 
@@ -344,10 +344,10 @@ describe('db-doc handler', () => {
         chai.expect(results[3])
           .to.deep.include(patients.find(patient => patient._id === 'fixture:offline:clinic:patient'));
 
-        chai.expect(results[4]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-        chai.expect(results[5]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-        chai.expect(results[6]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-        chai.expect(results[7]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+        chai.expect(results[4]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+        chai.expect(results[5]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+        chai.expect(results[6]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+        chai.expect(results[7]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
       });
     });
 
@@ -422,7 +422,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include(reportScenarios[idx].doc);
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -456,7 +456,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include(reportScenarios[idx].doc);
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -496,7 +496,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include(reportScenarios[idx].doc);
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -655,7 +655,7 @@ describe('db-doc handler', () => {
               if (patientsToDelete[idx]._id.startsWith('temp:offline')) {
                 chai.expect(result).to.deep.include(patientsToDelete[idx]);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
               }
             });
           })
@@ -668,7 +668,7 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc, idx);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'}, idx);
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'}, idx);
               }
             });
           })
@@ -683,7 +683,7 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc, idx);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'}, idx);
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'}, idx);
               }
             });
           })
@@ -700,7 +700,7 @@ describe('db-doc handler', () => {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
                 chai.expect(result._deleted).to.equal(true);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
               }
             });
           });
@@ -776,7 +776,7 @@ describe('db-doc handler', () => {
           .then(results => {
             // cannot read patients
             results.forEach(result => {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             });
           })
           .then(() => Promise.all(reportScenarios.map(scenario => utils.requestOnTestDb(
@@ -788,7 +788,7 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
               }
             });
           })
@@ -801,7 +801,7 @@ describe('db-doc handler', () => {
           .then(results => {
             // cannot read deleted patients
             results.forEach(result => {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             });
           })
           .then(() => Promise.all(reportScenarios.map(scenario => utils.requestOnTestDb(
@@ -813,7 +813,7 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'}, idx);
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'}, idx);
               }
             });
           })
@@ -828,7 +828,7 @@ describe('db-doc handler', () => {
               if (reportScenarios[idx].allowed) {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
               }
             });
           })
@@ -845,7 +845,7 @@ describe('db-doc handler', () => {
                 chai.expect(result).to.deep.include(reportScenarios[idx].doc);
                 chai.expect(result._deleted).to.equal(true);
               } else {
-                chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+                chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
               }
             });
           });
@@ -1024,9 +1024,9 @@ describe('db-doc handler', () => {
           chai.expect(results[2]._revs_info.length).to.deep.equal(results[2]._revisions.ids.length);
           chai.expect(results[2]._revs_info[0]).to.deep.equal({ rev: revs.allowed_attach[1], status: 'available' });
 
-          chai.expect(results[3].statusCode).to.deep.equal(403);
-          chai.expect(results[4].statusCode).to.deep.equal(403);
-          chai.expect(results[5].statusCode).to.deep.equal(403);
+          chai.expect(results[3].status).to.deep.equal(403);
+          chai.expect(results[4].status).to.deep.equal(403);
+          chai.expect(results[5].status).to.deep.equal(403);
         });
     });
 
@@ -1076,9 +1076,9 @@ describe('db-doc handler', () => {
         ]))
         .then(results => {
           chai.expect(results[0]).to.deep.include(allowedTask);
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           chai.expect(results[2]).to.deep.include(allowedTarget);
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         })
         .then(() => Promise.all([
           utils.requestOnTestDb(_.defaults({ path: '/fixture:user:offline' }, supervisorRequestOptions)),
@@ -1097,13 +1097,13 @@ describe('db-doc handler', () => {
           // supervisor can see the user's contact
           chai.expect(results[0]._id).to.equal('fixture:user:offline');
           // supervisor can't see the user's user-settings document
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           // supervisor has replication depth of 2
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           // supervisor can't see the any user's tasks
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[4]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[4]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           // supervisor can see both targets
           chai.expect(results[5]).to.deep.include(allowedTarget);
@@ -1137,7 +1137,7 @@ describe('db-doc handler', () => {
         .then(() => utils.requestOnTestDb(_.defaults({ path: `/${doc._id}` }, offlineRequestOptions)).catch(err => err))
         .then(result => {
           // user can't see the unallocated report without permissions
-          chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         })
         .then(() => utils.updateSettings(settings, { ignoreReload: true }))
         .then(() => utils.requestOnTestDb(_.defaults({ path: `/${doc._id}` }, offlineRequestOptions)).catch(err => err))
@@ -1253,7 +1253,7 @@ describe('db-doc handler', () => {
               chai.expect(result).excluding('_rev').to.deep.equal(originalDoc);
             } else {
               // a private report, expect an error
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1282,8 +1282,8 @@ describe('db-doc handler', () => {
       ])
         .then(([allowed, denied, forbidden]) => {
           chai.expect(allowed).to.include({ id: 'allowed_doc_post', ok: true, });
-          chai.expect(denied).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(forbidden).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(denied).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(forbidden).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           return Promise.all([
             utils.getDoc('allowed_doc_post'),
@@ -1292,7 +1292,7 @@ describe('db-doc handler', () => {
         })
         .then(([allowed, denied]) => {
           chai.expect(allowed).to.deep.include(allowedDoc);
-          chai.expect(denied.statusCode).to.deep.equal(404);
+          chai.expect(denied.status).to.deep.equal(404);
 
           const ids = ['allowed_doc_post', 'denied_doc_post'];
           return sentinelUtils.waitForSentinel(ids).then(() => sentinelUtils.getInfoDocs(ids));
@@ -1385,7 +1385,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include({ ok: true, id: reportScenarios[idx].doc._id });
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1419,7 +1419,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include({ ok: true, id: reportScenarios[idx].doc._id });
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1469,9 +1469,9 @@ describe('db-doc handler', () => {
         ])
         .then(results => {
           chai.expect(results[0]).to.deep.include({ ok: true, id: 'task1' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           chai.expect(results[2]).to.deep.include({ ok: true, id: 'target1' });
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         });
     });
 
@@ -1534,12 +1534,12 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           chai.expect(results[0]).to.include({ ok: true, id: 'n_put_1' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           chai.expect(results[2]).to.include({ ok: true, id: 'a_put_1', });
 
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[4]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[5]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[4]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[5]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           const ids = ['a_put_1', 'a_put_2', 'd_put_1', 'd_put_2', 'n_put_1', 'n_put_2'];
 
@@ -1607,10 +1607,10 @@ describe('db-doc handler', () => {
             .catch(err => err)));
         })
         .then(results => {
-          chai.expect(results[0]).to.deep.nested.include({ statusCode: 409, 'responseBody.error': 'conflict'});
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 409, 'responseBody.error': 'conflict'});
+          chai.expect(results[0]).to.deep.nested.include({ status: 409, 'body.error': 'conflict'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 409, 'body.error': 'conflict'});
         });
     });
 
@@ -1685,7 +1685,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include({ ok: true, id: reportScenarios[idx].doc._id });
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1719,7 +1719,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include({ ok: true, id: reportScenarios[idx].doc._id });
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1758,7 +1758,7 @@ describe('db-doc handler', () => {
             if (reportScenarios[idx].allowed) {
               chai.expect(result).to.deep.include({ ok: true, id: reportScenarios[idx].doc._id });
             } else {
-              chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+              chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
             }
           });
         });
@@ -1812,9 +1812,9 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           chai.expect(results[0]).to.deep.include({ ok: true, id: 'task1' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           chai.expect(results[2]).to.deep.include({ ok: true, id: 'target1' });
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         });
     });
 
@@ -1843,7 +1843,7 @@ describe('db-doc handler', () => {
         ]))
         .then(results => {
           chai.expect(results[0]).to.deep.include({ id: 'allowed_del', ok: true });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           return Promise.all([
             utils.getDoc('allowed_del').catch(err => err),
@@ -1852,7 +1852,7 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           chai.expect(results[0]).to.deep.include({
-            statusCode: 404, responseBody: { error: 'not_found', reason: 'deleted' }
+            status: 404, body: { error: 'not_found', reason: 'deleted' }
           });
           chai.expect(results[1]).to.deep.include({
             _id: 'denied_del',
@@ -1915,10 +1915,10 @@ describe('db-doc handler', () => {
         .then(results => {
           chai.expect(results[0]).to.equal('my attachment content');
           chai.expect(results[1]).to.deep.include(
-            { statusCode: 404, responseBody: { error: 'bad_request', reason: 'Invalid rev format' }}
+            { status: 404, body: { error: 'bad_request', reason: 'Invalid rev format' }}
           );
           chai.expect(results[2]).to.deep.include(
-            { statusCode: 403, responseBody: { error: 'forbidden', reason: 'Insufficient privileges' }}
+            { status: 403, body: { error: 'forbidden', reason: 'Insufficient privileges' }}
           );
 
           return Promise.all([
@@ -1945,19 +1945,19 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           // allowed_attach is allowed, but missing attachment
-          chai.expect(results[0].responseBody).to.deep.equal({
+          chai.expect(results[0].body).to.deep.equal({
             error: 'not_found',
             reason: 'Document is missing attachment',
           });
           // allowed_attach is allowed and has attachment
           chai.expect(results[1]).to.equal('my attachment content');
           // allowed_attach is not allowed and has attachment
-          chai.expect(results[2].responseBody.error).to.equal('forbidden');
+          chai.expect(results[2].body.error).to.equal('forbidden');
 
           // denied_attach is not allowed, but missing attachment
-          chai.expect(results[3].responseBody.error).to.equal('forbidden');
+          chai.expect(results[3].body.error).to.equal('forbidden');
           // denied_attach is not allowed and has attachment
-          chai.expect(results[4].responseBody.error).to.equal('forbidden');
+          chai.expect(results[4].body.error).to.equal('forbidden');
           // denied_attach is allowed and has attachment
           chai.expect(results[5]).to.equal('my attachment content');
 
@@ -1987,9 +1987,9 @@ describe('db-doc handler', () => {
           ]);
         })
         .then(results => {
-          chai.expect(results[0]).to.deep.nested.include({ statusCode: 404, 'responseBody.error': 'bad_request' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 404, 'responseBody.error': 'bad_request' });
+          chai.expect(results[0]).to.deep.nested.include({ status: 404, 'body.error': 'bad_request' });
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 404, 'body.error': 'bad_request' });
           chai.expect(results[3]).to.equal('my attachment content');
         });
     });
@@ -2050,8 +2050,8 @@ describe('db-doc handler', () => {
           chai.expect(results[0]).to.equal('my attachment content');
           chai.expect(results[1]).to.equal('my attachment content');
 
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 404, 'responseBody.error': 'bad_request' });
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 404, 'body.error': 'bad_request' });
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           return Promise.all([
             utils.getDoc('allowed_attach_1'),
@@ -2078,18 +2078,18 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           // allowed_attach is allowed, but missing attachment
-          chai.expect(results[0].responseBody).to.deep.equal({
+          chai.expect(results[0].body).to.deep.equal({
             error: 'not_found',
             reason: 'Document is missing attachment',
           });
           // allowed_attach is allowed and has attachment
           chai.expect(results[1]).to.equal('my attachment content');
           // allowed_attach is not allowed and has attachment
-          chai.expect(results[2].responseBody.error).to.equal('forbidden');
+          chai.expect(results[2].body.error).to.equal('forbidden');
           // denied_attach is not allowed, but missing attachment
-          chai.expect(results[3].responseBody.error).to.equal('forbidden');
+          chai.expect(results[3].body.error).to.equal('forbidden');
           // denied_attach is not allowed and has attachment
-          chai.expect(results[4].responseBody.error).to.equal('forbidden');
+          chai.expect(results[4].body.error).to.equal('forbidden');
           // denied_attach is allowed and has attachment
           chai.expect(results[5]).to.equal('my attachment content');
         });
@@ -2127,7 +2127,7 @@ describe('db-doc handler', () => {
         ))
         .then(results => {
           chai.expect(results[0]).to.deep.include({ ok: true,  id: 'a_with_attachments' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
 
           return Promise.all([
             utils.requestOnTestDb({ path: '/a_with_attachments' }),
@@ -2145,7 +2145,7 @@ describe('db-doc handler', () => {
           chai.expect(results[2]._attachments).to.be.undefined;
           chai.expect(results[2]._id).to.equal('d_with_attachments');
 
-          chai.expect(results[3].responseBody.error).to.equal('not_found');
+          chai.expect(results[3].body.error).to.equal('not_found');
         });
     });
   });
@@ -2164,7 +2164,7 @@ describe('db-doc handler', () => {
           type: 'person',
           parent: { _id: 'fixture:offline', parent: { _id: 'PARENT_PLACE' } },
         });
-        chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+        chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
       });
     });
 
@@ -2218,11 +2218,11 @@ describe('db-doc handler', () => {
         })
         .then(results => {
           chai.expect(results[0]).to.deep.include({ ok: true, id: 'n_put_1' });
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           chai.expect(results[2]).to.deep.include({ ok: true, id: 'a_put_1' });
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[4]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[5]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[4]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[5]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         });
     });
 
@@ -2306,7 +2306,7 @@ describe('db-doc handler', () => {
           .catch(err => err),
       ]))
       .then(results => {
-        chai.expect(results.every(result => result.statusCode === 403 || result.statusCode === 404)).to.equal(true);
+        chai.expect(results.every(result => result.status === 403 || result.status === 404)).to.equal(true);
       });
   });
 
@@ -2347,7 +2347,7 @@ describe('db-doc handler', () => {
         return utils.requestOnTestDb(offlineRequestOptions).catch(err => err);
       })
       .then(result => {
-        chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+        chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         return utils.getDoc('fb1');
       })
       .then(result => {
@@ -2368,9 +2368,9 @@ describe('db-doc handler', () => {
         .then(results => {
           chai.expect(results[0]._id).to.equal('_design/medic-client');
 
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         });
     });
 
@@ -2392,10 +2392,10 @@ describe('db-doc handler', () => {
             .catch(err => err),
         ])
         .then(results => {
-          chai.expect(results[0]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[1]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[2]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
-          chai.expect(results[3]).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+          chai.expect(results[0]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[1]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[2]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
+          chai.expect(results[3]).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
         });
     });
 
@@ -2425,7 +2425,7 @@ describe('db-doc handler', () => {
         ])
         .then(results => {
           results.forEach(result => {
-            chai.expect(result).to.deep.nested.include({ statusCode: 403, 'responseBody.error': 'forbidden'});
+            chai.expect(result).to.deep.nested.include({ status: 403, 'body.error': 'forbidden'});
           });
         });
     });
diff --git a/tests/integration/api/controllers/hydration.spec.js b/tests/integration/api/controllers/hydration.spec.js
index df74fee36da..a32e9668a40 100644
--- a/tests/integration/api/controllers/hydration.spec.js
+++ b/tests/integration/api/controllers/hydration.spec.js
@@ -269,8 +269,8 @@ describe('Hydration API', () => {
         .request(noAuthRequestOptions)
         .then(() => chai.assert.fail('Should not allow unauthenticated requests'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(401);
-          chai.expect(err.error).to.deep.include({ code: 401, error: 'unauthorized' });
+          chai.expect(err.status).to.equal(401);
+          chai.expect(err.body).to.deep.include({ code: 401, error: 'unauthorized' });
         });
     });
 
@@ -281,8 +281,8 @@ describe('Hydration API', () => {
         .request(noAuthRequestOptions)
         .then(() => chai.assert.fail('Should not allow unauthenticated requests'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(401);
-          chai.expect(err.error).to.deep.include({ code: 401, error: 'unauthorized' });
+          chai.expect(err.status).to.equal(401);
+          chai.expect(err.body).to.deep.include({ code: 401, error: 'unauthorized' });
         });
     });
   });
@@ -294,8 +294,8 @@ describe('Hydration API', () => {
         .request(offlineRequestOptions)
         .then(() => chai.assert.fail('Should not allow offline users'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(403);
-          chai.expect(err.error).to.deep.include({ code: 403, error: 'forbidden' });
+          chai.expect(err.status).to.equal(403);
+          chai.expect(err.body).to.deep.include({ code: 403, error: 'forbidden' });
         });
     });
 
@@ -306,8 +306,8 @@ describe('Hydration API', () => {
         .request(offlineRequestOptions)
         .then(() => chai.assert.fail('Should not allow offline users'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(403);
-          chai.expect(err.error).to.deep.include({ code: 403, error: 'forbidden' });
+          chai.expect(err.status).to.equal(403);
+          chai.expect(err.body).to.deep.include({ code: 403, error: 'forbidden' });
         });
     });
   });
@@ -318,8 +318,8 @@ describe('Hydration API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`doc_ids` parameter must be a json array.'
           });
@@ -332,8 +332,8 @@ describe('Hydration API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`doc_ids` parameter must be a json array.'
           });
@@ -480,8 +480,8 @@ describe('Hydration API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`doc_ids` parameter must be a json array.'
           });
@@ -494,8 +494,8 @@ describe('Hydration API', () => {
         .request(onlineRequestOptions)
         .then(() => chai.assert.fail('Should fail when no params'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.status).to.equal(400);
+          chai.expect(err.body).to.deep.equal({
             error: 'bad_request',
             reason: '`doc_ids` parameter must be a json array.'
           });
diff --git a/tests/integration/api/controllers/login.spec.js b/tests/integration/api/controllers/login.spec.js
index dc9be54a07e..c14a19c86be 100644
--- a/tests/integration/api/controllers/login.spec.js
+++ b/tests/integration/api/controllers/login.spec.js
@@ -20,10 +20,10 @@ const loginWithData = data => {
   const opts = {
     path: '/medic/login?aaa=aaa',
     method: 'POST',
-    simple: false,
+    resolveWithFullResponse: true,
     noAuth: true,
     body: data,
-    followRedirect: false,
+    redirect: 'manual',
     headers: { 'X-Forwarded-For': randomIp() },
   };
   return utils.request(opts);
@@ -33,10 +33,9 @@ const loginWithTokenLink = (token = '') => {
   const opts = {
     path: `/medic/login/token/${token}`,
     method: 'POST',
-    simple: false,
     resolveWithFullResponse: true,
     noAuth: true,
-    followRedirect: false,
+    redirect: 'manual',
     body: {},
     headers: { 'X-Forwarded-For': randomIp() },
   };
@@ -44,16 +43,16 @@ const loginWithTokenLink = (token = '') => {
 };
 
 const expectLoginToWork = (response) => {
-  chai.expect(response).to.include({ statusCode: 302 });
-  chai.expect(response.headers['set-cookie']).to.be.an('array');
-  chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
-  chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
+  chai.expect(response).to.include({ status: 302 });
+  chai.expect(response.headers.getSetCookie()).to.be.an('array');
+  chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
+  chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
   chai.expect(response.body).to.equal('/');
 };
 
 const expectLoginToFail = (response) => {
-  chai.expect(response.headers['set-cookie']).to.be.undefined;
-  chai.expect(response.statusCode).to.equal(401);
+  chai.expect(response.headers.getSetCookie()).to.deep.equal([]);
+  chai.expect(response.status).to.equal(401);
 };
 
 const getUser = (user) => {
@@ -135,7 +134,7 @@ describe('login', () => {
     it('should fail with invalid url', () => {
       return setupTokenLoginSettings()
         .then(() => loginWithTokenLink())
-        .then(response => chai.expect(response).to.deep.include({ statusCode: 401 }));
+        .then(response => chai.expect(response).to.deep.include({ status: 401 }));
     });
 
     it('should fail with invalid data', () => {
diff --git a/tests/integration/api/controllers/person.spec.js b/tests/integration/api/controllers/person.spec.js
index d35b93d179d..fa21dc6f22e 100644
--- a/tests/integration/api/controllers/person.spec.js
+++ b/tests/integration/api/controllers/person.spec.js
@@ -1,8 +1,6 @@
 const utils = require('@utils');
 const placeFactory = require('@factories/cht/contacts/place');
 const personFactory = require('@factories/cht/contacts/person');
-const { getRemoteDataContext, Person, Qualifier } = require('@medic/cht-datasource');
-const { expect } = require('chai');
 const userFactory = require('@factories/cht/users/users');
 
 describe('Person API', () => {
@@ -47,7 +45,6 @@ describe('Person API', () => {
     roles: ['chw']
   }));
   const allDocItems = [contact0, contact1, contact2, place0, place1, place2, patient];
-  const dataContext = getRemoteDataContext(utils.getOrigin());
   const personType = 'person';
   const e2eTestUser = {
     '_id': 'e2e_contact_test_id',
@@ -96,16 +93,13 @@ describe('Person API', () => {
   });
 
   describe('GET /api/v1/person/:uuid', async () => {
-    const getPerson = Person.v1.get(dataContext);
-    const getPersonWithLineage = Person.v1.getWithLineage(dataContext);
-
     it('returns the person matching the provided UUID', async () => {
-      const person = await getPerson(Qualifier.byUuid(patient._id));
+      const person = await utils.request(`/api/v1/person/${patient._id}`);
       expect(person).excluding(['_rev', 'reported_date']).to.deep.equal(patient);
     });
 
     it('returns the person with lineage when the withLineage query parameter is provided', async () => {
-      const person = await getPersonWithLineage(Qualifier.byUuid(patient._id));
+      const person = await utils.request({ path: `/api/v1/person/${patient._id}`, qs: { with_lineage: true } });
       expect(person).excludingEvery(['_rev', 'reported_date']).to.deep.equal({
         ...patient,
         parent: {
@@ -124,8 +118,8 @@ describe('Person API', () => {
     });
 
     it('returns null when no person is found for the UUID', async () => {
-      const person = await getPerson(Qualifier.byUuid('invalid-uuid'));
-      expect(person).to.be.null;
+      await expect(utils.request('/api/v1/person/invalid-uuid'))
+        .to.be.rejectedWith('404 - {"code":404,"error":"Person not found"}');
     });
 
     [
@@ -143,13 +137,11 @@ describe('Person API', () => {
   });
 
   describe('GET /api/v1/person', async () => {
-    const getPage = Person.v1.getPage(dataContext);
     const limit = 4;
-    const cursor = null;
     const invalidContactType = 'invalidPerson';
 
     it('returns a page of people for no limit and cursor passed', async () => {
-      const responsePage = await getPage(Qualifier.byContactType(personType));
+      const responsePage = await utils.request({ path: `/api/v1/person`, qs: { type: personType } });
       const responsePeople = responsePage.data;
       const responseCursor = responsePage.cursor;
 
@@ -158,8 +150,11 @@ describe('Person API', () => {
     });
 
     it('returns a page of people when limit and cursor is passed and cursor can be reused', async () => {
-      const firstPage = await getPage(Qualifier.byContactType(personType), cursor, limit);
-      const secondPage = await getPage(Qualifier.byContactType(personType), firstPage.cursor, limit);
+      const firstPage = await utils.request({ path: `/api/v1/person`, qs: { type: personType, limit } });
+      const secondPage = await utils.request({
+        path: `/api/v1/person`,
+        qs: { type: personType, cursor: firstPage.cursor, limit }
+      });
 
       const allPeople = [...firstPage.data, ...secondPage.data];
 
@@ -230,17 +225,18 @@ describe('Person API', () => {
     });
   });
 
-  describe('Person.v1.getAll', async () => {
-    it('fetches all data by iterating through generator', async () => {
-      const docs = [];
-
-      const generator = Person.v1.getAll(dataContext)(Qualifier.byContactType(personType));
-
-      for await (const doc of generator) {
-        docs.push(doc);
-      }
-
-      expect(docs).excluding(['_rev', 'reported_date']).to.deep.equalInAnyOrder(expectedPeople);
-    });
-  });
+  // todo rethink this once datasource works with authentication #9701
+  // describe('Person.v1.getAll', async () => {
+  //   it('fetches all data by iterating through generator', async () => {
+  //     const docs = [];
+  //
+  //     const generator = Person.v1.getAll(dataContext)(Qualifier.byContactType(personType));
+  //
+  //     for await (const doc of generator) {
+  //       docs.push(doc);
+  //     }
+  //
+  //     expect(docs).excluding(['_rev', 'reported_date']).to.deep.equalInAnyOrder(expectedPeople);
+  //   });
+  // });
 });
diff --git a/tests/integration/api/controllers/place.spec.js b/tests/integration/api/controllers/place.spec.js
index d80ed338461..962144d403f 100644
--- a/tests/integration/api/controllers/place.spec.js
+++ b/tests/integration/api/controllers/place.spec.js
@@ -1,8 +1,6 @@
 const utils = require('@utils');
 const placeFactory = require('@factories/cht/contacts/place');
 const personFactory = require('@factories/cht/contacts/person');
-const { getRemoteDataContext, Place, Qualifier } = require('@medic/cht-datasource');
-const { expect } = require('chai');
 const userFactory = require('@factories/cht/users/users');
 
 describe('Place API', () => {
@@ -62,7 +60,6 @@ describe('Place API', () => {
     },
     roles: ['chw']
   }));
-  const dataContext = getRemoteDataContext(utils.getOrigin());
   const expectedPlaces = [place0, clinic1, clinic2];
 
   before(async () => {
@@ -76,16 +73,13 @@ describe('Place API', () => {
   });
 
   describe('GET /api/v1/place/:uuid', async () => {
-    const getPlace = Place.v1.get(dataContext);
-    const getPlaceWithLineage = Place.v1.getWithLineage(dataContext);
-
     it('returns the place matching the provided UUID', async () => {
-      const place = await getPlace(Qualifier.byUuid(place0._id));
+      const place = await utils.request(`/api/v1/place/${place0._id}`);
       expect(place).excluding(['_rev', 'reported_date']).to.deep.equal(place0);
     });
 
     it('returns the place with lineage when the withLineage query parameter is provided', async () => {
-      const place = await getPlaceWithLineage(Qualifier.byUuid(place0._id));
+      const place = await utils.request({ path: `/api/v1/place/${place0._id}`, qs: { with_lineage: true } });
       expect(place).excludingEvery(['_rev', 'reported_date']).to.deep.equal({
         ...place0,
         contact: contact0,
@@ -101,8 +95,8 @@ describe('Place API', () => {
     });
 
     it('returns null when no place is found for the UUID', async () => {
-      const place = await getPlace(Qualifier.byUuid('invalid-uuid'));
-      expect(place).to.be.null;
+      await expect(utils.request('/api/v1/place/invalid-uuid'))
+        .to.be.rejectedWith('404 - {"code":404,"error":"Place not found"}');
     });
 
     [
@@ -120,13 +114,11 @@ describe('Place API', () => {
   });
 
   describe('GET /api/v1/place', async () => {
-    const getPage = Place.v1.getPage(dataContext);
     const limit = 2;
-    const cursor = null;
     const invalidContactType = 'invalidPlace';
 
     it('returns a page of places for no limit and cursor passed', async () => {
-      const responsePage = await getPage(Qualifier.byContactType(placeType));
+      const responsePage = await utils.request({ path: `/api/v1/place`, qs: { type: placeType } });
       const responsePlaces = responsePage.data;
       const responseCursor = responsePage.cursor;
 
@@ -136,8 +128,11 @@ describe('Place API', () => {
     });
 
     it('returns a page of places when limit and cursor is passed and cursor can be reused', async () => {
-      const firstPage = await getPage(Qualifier.byContactType(placeType), cursor, limit);
-      const secondPage = await getPage(Qualifier.byContactType(placeType), firstPage.cursor, limit);
+      const firstPage = await utils.request({ path: `/api/v1/place`, qs: { type: placeType, limit } });
+      const secondPage = await utils.request({
+        path: `/api/v1/place`,
+        qs: { type: placeType, cursor: firstPage.cursor, limit }
+      });
 
       const allPeople = [...firstPage.data, ...secondPage.data];
 
@@ -208,17 +203,18 @@ describe('Place API', () => {
     });
   });
 
-  describe('Place.v1.getAll', async () => {
-    it('fetches all data by iterating through generator', async () => {
-      const docs = [];
-
-      const generator = Place.v1.getAll(dataContext)(Qualifier.byContactType(placeType));
-
-      for await (const doc of generator) {
-        docs.push(doc);
-      }
-
-      expect(docs).excluding(['_rev', 'reported_date']).to.deep.equalInAnyOrder(expectedPlaces);
-    });
-  });
+  // todo rethink this once datasource works with authentication #9701
+  // describe('Place.v1.getAll', async () => {
+  //   it('fetches all data by iterating through generator', async () => {
+  //     const docs = [];
+  //
+  //     const generator = Place.v1.getAll(dataContext)(Qualifier.byContactType(placeType));
+  //
+  //     for await (const doc of generator) {
+  //       docs.push(doc);
+  //     }
+  //
+  //     expect(docs).excluding(['_rev', 'reported_date']).to.deep.equalInAnyOrder(expectedPlaces);
+  //   });
+  // });
 });
diff --git a/tests/integration/api/controllers/places.spec.js b/tests/integration/api/controllers/places.spec.js
index 3d0862b4ef6..d607da09363 100644
--- a/tests/integration/api/controllers/places.spec.js
+++ b/tests/integration/api/controllers/places.spec.js
@@ -205,7 +205,7 @@ describe('Places API', () => {
       return utils.request(onlineRequestOptions)
         .then(() => fail('Call should fail as contact type is not a person'))
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('Wrong type, this is not a person.');
+          chai.expect(err.body.error).to.equal('Wrong type, this is not a person.');
         });
 
     });
@@ -220,7 +220,7 @@ describe('Places API', () => {
       return utils.request(onlineRequestOptions)
         .then(() => fail('Call should fail as contact does not exist'))
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('Failed to find person.');
+          chai.expect(err.body.error).to.equal('Failed to find person.');
         });
 
     });
diff --git a/tests/integration/api/controllers/records.spec.js b/tests/integration/api/controllers/records.spec.js
index 97c2434cee5..bcea32cfd9a 100644
--- a/tests/integration/api/controllers/records.spec.js
+++ b/tests/integration/api/controllers/records.spec.js
@@ -46,9 +46,6 @@ describe('Import Records', () => {
         .then(() => utils.request({
           method: 'POST',
           path: '/api/v2/records',
-          headers: {
-            'Content-type': 'application/json'
-          },
           body: {
             _meta: {
               form: 'TEST',
@@ -94,9 +91,6 @@ describe('Import Records', () => {
         .then(() => utils.request({
           method: 'POST',
           path: '/api/v2/records',
-          headers: {
-            'Content-type': 'application/json'
-          },
           body: {
             _meta: {
               form: 'TEST'
@@ -134,9 +128,6 @@ describe('Import Records', () => {
         .then(() => utils.request({
           method: 'POST',
           path: '/api/v2/records',
-          headers: {
-            'Content-type': 'application/json'
-          },
           body: {
             _meta: {
               form: 'TEST',
diff --git a/tests/integration/api/controllers/replication.spec.js b/tests/integration/api/controllers/replication.spec.js
index 4213d4cf6cd..77a74fbda20 100644
--- a/tests/integration/api/controllers/replication.spec.js
+++ b/tests/integration/api/controllers/replication.spec.js
@@ -193,7 +193,7 @@ describe('replication', () => {
   ];
 
   before(async () => {
-    await utils.updatePermissions(['district_admin'], ['can_have_multiple_places'], [], true);
+    await utils.updatePermissions(['district_admin'], ['can_have_multiple_places'], [], { ignoreReload: true });
     await utils.saveDoc(parentPlace);
     await utils.createUsers(users, true);
   });
@@ -1089,8 +1089,6 @@ describe('replication', () => {
         { purge: { fn: purgeFn.toString(), text_expression: 'every 1 seconds' } },
         { ignoreReload: true }
       );
-      await utils.stopSentinel();
-      await utils.startSentinel();
       await sentinelUtils.waitForPurgeCompletion(seq);
 
       const response = await requestDeletes('bob', getIds(reports));
@@ -1115,8 +1113,6 @@ describe('replication', () => {
         { purge: { fn: purgeFn.toString(), text_expression: 'every 1 seconds' } },
         { ignoreReload: true }
       );
-      await utils.stopSentinel();
-      await utils.startSentinel();
       await sentinelUtils.waitForPurgeCompletion(seq);
 
       const response = await requestDeletes('bob', [...savedIds, ...deletedIds, ...getIds(reports)]);
diff --git a/tests/integration/api/controllers/settings.spec.js b/tests/integration/api/controllers/settings.spec.js
index c4bda666dc9..643a2ba01a9 100644
--- a/tests/integration/api/controllers/settings.spec.js
+++ b/tests/integration/api/controllers/settings.spec.js
@@ -29,7 +29,6 @@ describe('Settings API', () => {
         path: uri,
         method: 'PUT',
         body: updates,
-        headers: { 'Content-Type': 'application/json' }
       });
     };
 
@@ -124,7 +123,6 @@ describe('Settings API', () => {
         path: '/api/v1/settings',
         method: 'PUT',
         body: updates,
-        headers: { 'Content-Type': 'application/json' },
         qs,
       });
     };
diff --git a/tests/integration/api/controllers/users.spec.js b/tests/integration/api/controllers/users.spec.js
index 68910df19c6..a129526f3ab 100644
--- a/tests/integration/api/controllers/users.spec.js
+++ b/tests/integration/api/controllers/users.spec.js
@@ -1,10 +1,6 @@
-const constants = require('@constants');
-const https = require('https');
 const utils = require('@utils');
 const uuid = require('uuid').v4;
 const querystring = require('querystring');
-const chai = require('chai');
-chai.use(require('chai-shallow-deep-equal'));
 const sentinelUtils = require('@utils/sentinel');
 const placeFactory = require('@factories/cht/contacts/place');
 const personFactory = require('@factories/cht/contacts/person');
@@ -29,10 +25,10 @@ describe('Users API', () => {
     const opts = {
       path: '/login',
       method: 'POST',
-      simple: false,
+      resolveWithFullResponse: true,
       noAuth: true,
       body: { user: user.username, password: user.password },
-      followRedirect: false,
+      redirect: 'manual',
       headers: { 'X-Forwarded-For': randomIp() },
     };
 
@@ -40,12 +36,12 @@ describe('Users API', () => {
       .requestOnMedicDb(opts)
       .then(response => {
         chai.expect(response).to.include({
-          statusCode: 302,
+          status: 302,
           body: '/',
         });
-        chai.expect(response.headers['set-cookie']).to.be.an('array');
-        chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
-        chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
+        chai.expect(response.headers.getSetCookie()).to.be.an('array');
+        chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
+        chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
       });
   };
 
@@ -53,7 +49,7 @@ describe('Users API', () => {
     const opts = {
       path: '/login',
       method: 'POST',
-      simple: false,
+      resolveWithFullResponse: true,
       noAuth: true,
       body: { user: user.username, password: user.password },
       headers: { 'X-Forwarded-For': randomIp() },
@@ -62,7 +58,7 @@ describe('Users API', () => {
     return utils
       .requestOnMedicDb(opts)
       .then(response => {
-        chai.expect(response).to.deep.include({ statusCode: 401, body: { error: 'Not logged in' } });
+        chai.expect(response).to.deep.include({ status: 401, body: { error: 'Not logged in' } });
       });
   };
 
@@ -114,66 +110,38 @@ describe('Users API', () => {
     ];
 
     before(async () => {
-      await utils.updatePermissions(['chw'], ['can_edit']);
+      await utils.updatePermissions(['chw'], ['can_edit'], [], { ignoreReload: true });
 
       await utils.request({
         path: '/_users',
         method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
         body: _usersUser
       });
 
       await utils.saveDocs(medicData);
 
-      return new Promise((resolve, reject) => {
-        const options = {
-          hostname: constants.API_HOST,
-          path: '/_session',
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          auth: `${username}:${password}`
-        };
-
-        // Use http service to extract cookie
-        const req = https.request(options, res => {
-          if (res.statusCode !== 200) {
-            return reject(new Error(`Expected 200 from _session authing, but got ${res.statusCode}`));
-          }
-
-          // Example header:
-          // AuthSession=cm9vdDo1MEJDMDEzRTp7Vu5GKCkTxTVxwXbpXsBARQWnhQ; Version=1; Path=/; HttpOnly
-          try {
-            cookie = res.headers['set-cookie'][0].match(/^(AuthSession=[^;]+)/)[0];
-          } catch (err) {
-            return reject(err);
-          }
-
-          resolve(cookie);
-        });
-
-        req.write(JSON.stringify({
+      const res = await utils.request({
+        path: '/_session',
+        auth: { username, password },
+        method: 'POST',
+        resolveWithFullResponse: true,
+        body: {
           name: username,
           password: password
-        }));
-        req.end();
+        }
       });
+      if (!res.ok) {
+        throw new Error(`Expected 200 from _session authing, but got ${res.status}`);
+      }
+
+      cookie = res.headers.getSetCookie().find(cookie => cookie.startsWith('AuthSession'));
+      if (!cookie) {
+        throw new Error('Expected auth cookie from _session authing');
+      }
     });
 
     after(async () => {
-      const { _rev } = await utils.request(`/_users/${getUserId(username)}`);
-      await utils.request({
-        path: `/_users/${getUserId(username)}`,
-        method: 'PUT',
-        body: {
-          _id: getUserId(username),
-          _rev,
-          _deleted: true,
-        }
-      });
+      await utils.deleteUsers([{ username }]);
       await utils.revertSettings(true);
       await utils.revertDb([], true);
     });
@@ -214,7 +182,7 @@ describe('Users API', () => {
         })
         .then(() => fail('You should get a 401 in this situation'))
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('You do not have permissions to modify this person');
+          chai.expect(err.body.error).to.equal('You do not have permissions to modify this person');
         });
     });
 
@@ -230,7 +198,7 @@ describe('Users API', () => {
         })
         .then(() => fail('You should get an error in this situation'))
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('unauthorized');
+          chai.expect(err.body.error).to.equal('unauthorized');
         });
     });
 
@@ -268,7 +236,7 @@ describe('Users API', () => {
         })
         .then(() => fail('You should get an error in this situation'))
         .catch(err => {
-          chai.expect(err.responseBody.error).to.equal('You must authenticate with Basic Auth to modify your password');
+          chai.expect(err.body.error).to.equal('You must authenticate with Basic Auth to modify your password');
         });
     });
 
@@ -516,7 +484,7 @@ describe('Users API', () => {
         .then(() => chai.expect.fail('should have thrown'))
         .catch(err => {
           // online users require the "can_update_users" permission to be able to access this endpoint
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.body).to.deep.equal({
             code: 403,
             error: 'Insufficient privileges',
           });
@@ -535,7 +503,7 @@ describe('Users API', () => {
         .then(() => chai.expect.fail('should have thrown'))
         .catch(err => {
           // online users require the "can_update_users" permission to be able to access this endpoint
-          chai.expect(err.error).to.deep.equal({
+          chai.expect(err.body).to.deep.equal({
             code: 403,
             error: 'Insufficient privileges',
           });
@@ -580,12 +548,11 @@ describe('Users API', () => {
         facility_id: 'fixture:offline'
       };
       onlineRequestOptions.path += '?' + querystring.stringify(params);
-      onlineRequestOptions.headers = { 'Content-Type': 'application/json' };
       return utils
         .request(onlineRequestOptions)
         .then(resp => chai.expect(resp).to.equal('should have thrown'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
+          chai.expect(err.status).to.equal(400);
         });
     });
 
@@ -599,7 +566,7 @@ describe('Users API', () => {
         .request(onlineRequestOptions)
         .then(resp => chai.expect(resp).to.equal('should have thrown'))
         .catch(err => {
-          chai.expect(err.statusCode).to.equal(400);
+          chai.expect(err.status).to.equal(400);
         });
     });
 
@@ -609,7 +576,6 @@ describe('Users API', () => {
         facility_id: 'IdonTExist'
       };
       onlineRequestOptions.path += '?' + querystring.stringify(params);
-      onlineRequestOptions.headers = { 'Content-Type': 'application/json' };
       return utils
         .request(onlineRequestOptions)
         .then(resp => {
@@ -682,18 +648,17 @@ describe('Users API', () => {
       const opts = {
         uri: url,
         method: 'POST',
-        simple: false,
         resolveWithFullResponse: true,
         noAuth: true,
-        followRedirect: false,
+        redirect: 'manual',
         body: {},
         headers: { 'X-Forwarded-For': randomIp() },
       };
       return utils.request(opts).then(response => {
-        chai.expect(response).to.include({ statusCode: 302, body: '/' });
-        chai.expect(response.headers['set-cookie']).to.be.an('array');
-        chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
-        chai.expect(response.headers['set-cookie'].find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
+        chai.expect(response).to.include({ status: 302, body: '/' });
+        chai.expect(response.headers.getSetCookie()).to.be.an('array');
+        chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('AuthSession'))).to.be.ok;
+        chai.expect(response.headers.getSetCookie().find(cookie => cookie.startsWith('userCtx'))).to.be.ok;
       });
     };
 
@@ -701,16 +666,15 @@ describe('Users API', () => {
       const opts = {
         uri: url,
         method: 'POST',
-        simple: false,
         noAuth: true,
-        followRedirect: false,
+        redirect: 'manual',
         resolveWithFullResponse: true,
         body: {},
         headers: { 'X-Forwarded-For': randomIp() },
       };
       return utils.request(opts).then(response => {
-        chai.expect(response.headers['set-cookie']).to.be.undefined;
-        chai.expect(response).to.deep.include({ statusCode: 401, body: { error: expired ? 'expired': 'invalid' } });
+        chai.expect(response.headers.getSetCookie()).to.deep.equal([]);
+        chai.expect(response).to.deep.include({ status: 401, body: { error: expired ? 'expired': 'invalid' } });
       });
     };
 
@@ -1253,8 +1217,8 @@ describe('Users API', () => {
           })
           .then(() => chai.assert.fail('should have thrown'))
           .catch(err => {
-            chai.expect(err.response).to.shallowDeepEqual({
-              statusCode: 400,
+            chai.expect(err).to.shallowDeepEqual({
+              status: 400,
               body: { code: 400, error: { message: 'Missing required fields: phone' }}
             });
           });
@@ -1273,8 +1237,8 @@ describe('Users API', () => {
           })
           .then(() => chai.assert.fail('should have thrown'))
           .catch(err => {
-            chai.expect(err.response).to.shallowDeepEqual({
-              statusCode: 400,
+            chai.expect(err).to.shallowDeepEqual({
+              status: 400,
               body: { code: 400, error: { message: 'Missing required fields: phone' }}
             });
 
@@ -1610,7 +1574,7 @@ describe('Users API', () => {
           chai.expect(tokenLoginDoc.user).to.equal('org.couchdb.user:testuser');
 
           const onlineRequestOpts = {
-            auth: { user: 'onlineuser', password },
+            auth: { username: 'onlineuser', password },
             method: 'PUT',
             path: `/${tokenLoginDoc._id}`,
             body: tokenLoginDoc,
@@ -1618,8 +1582,8 @@ describe('Users API', () => {
           return utils.requestOnTestDb(onlineRequestOpts).catch(err => err);
         })
         .then(err => {
-          chai.expect(err.response).to.deep.include({
-            statusCode: 403,
+          chai.expect(err).to.deep.include({
+            status: 403,
             body: {
               error: 'forbidden',
               reason: 'Insufficient privileges'
@@ -1655,7 +1619,7 @@ describe('Users API', () => {
       await utils.saveDocs([ facility, person ]);
       await utils.createUsers([{ ...user, password }, { ...userProgramOfficer, password }]);
 
-      await utils.updatePermissions(['program_officer'], ['can_view_users']);
+      await utils.updatePermissions(['program_officer'], ['can_view_users'], [], { ignoreReload: true });
     });
 
     after(async () => {
@@ -1694,9 +1658,9 @@ describe('Users API', () => {
         await utils.request({
           path: `/api/v2/users/invalidUsername`,
         });
-      } catch ({ error }) {
-        expect(error.code).to.equal(404);
-        expect(error.error).to
+      } catch ({ body }) {
+        expect(body.code).to.equal(404);
+        expect(body.error).to
           .match(/Failed to find user with name \[invalidUsername\] in the \[(users|medic)\] database./);
         return;
       }
@@ -1710,9 +1674,9 @@ describe('Users API', () => {
           path: `/api/v2/users/${userProgramOfficer.username}`,
           auth: { username: user.username, password },
         });
-      } catch ({ error }) {
-        expect(error.code).to.equal(403);
-        expect(error.error).to.equal('Insufficient privileges');
+      } catch ({ body }) {
+        expect(body.code).to.equal(403);
+        expect(body.error).to.equal('Insufficient privileges');
         return;
       }
 
@@ -1944,7 +1908,12 @@ describe('Users API', () => {
     });
 
     it('should create users with multiple facilities', async () => {
-      await utils.updatePermissions(['national_admin', 'chw'], ['can_have_multiple_places'], [], true);
+      await utils.updatePermissions(
+        ['national_admin', 'chw'],
+        ['can_have_multiple_places'],
+        [],
+        { ignoreReload: true }
+      );
       const onlineUserPayload = {
         username: uuid(),
         password: password,
@@ -2007,13 +1976,13 @@ describe('Users API', () => {
         await utils.request({ path: '/api/v3/users', method: 'POST', body: offlineUserPayload });
         expect.fail('Should have thrown');
       } catch (error) {
-        expect(error.statusCode).to.equal(400);
-        expect(error.error.error.message).to.equal('This user cannot have multiple places');
+        expect(error.status).to.equal(400);
+        expect(error.body.error.message).to.equal('This user cannot have multiple places');
       }
     });
 
     it('should edit users to add multiple facilities', async () => {
-      await utils.updatePermissions(['national_admin'], ['can_have_multiple_places']);
+      await utils.updatePermissions(['national_admin'], ['can_have_multiple_places'], [], { ignoreReload: true });
       const onlineUserPayload = {
         username: uuid(),
         password: password,
@@ -2049,7 +2018,12 @@ describe('Users API', () => {
     });
 
     it('should fail when facilities are malformed', async () => {
-      await utils.updatePermissions(['national_admin', 'chw'], ['can_have_multiple_places'], [], true);
+      await utils.updatePermissions(
+        ['national_admin', 'chw'],
+        ['can_have_multiple_places'],
+        [],
+        { ignoreReload: true }
+      );
       const onlineUserPayload = {
         username: uuid(),
         password: password,
@@ -2062,8 +2036,8 @@ describe('Users API', () => {
         await utils.request({ path: '/api/v3/users', method: 'POST', body: onlineUserPayload });
         expect.expect.fail('Should have thrown');
       } catch (err) {
-        expect(err.responseBody.code).to.equal(400);
-        expect(err.responseBody.error.message).to.equal('Invalid facilities list');
+        expect(err.body.code).to.equal(400);
+        expect(err.body.error.message).to.equal('Invalid facilities list');
       }
 
       const offlineUserPayload = {
@@ -2078,8 +2052,8 @@ describe('Users API', () => {
         await utils.request({ path: '/api/v3/users', method: 'POST', body: offlineUserPayload });
         expect.expect.fail('Should have thrown');
       } catch (err) {
-        expect(err.responseBody.code).to.equal(400);
-        expect(err.responseBody.error.message).to.equal('Missing required fields: place');
+        expect(err.body.code).to.equal(400);
+        expect(err.body.error.message).to.equal('Missing required fields: place');
       }
     });
   });
diff --git a/tests/integration/api/controllers/well-known.spec.js b/tests/integration/api/controllers/well-known.spec.js
index 6d77886ce78..a27d0bf94ea 100644
--- a/tests/integration/api/controllers/well-known.spec.js
+++ b/tests/integration/api/controllers/well-known.spec.js
@@ -17,7 +17,7 @@ describe('well-known', () => {
       })
         .then(() => chai.expect.fail('should have thrown'))
         .catch(error => {
-          chai.expect(error.response.statusCode).to.equal(404);
+          chai.expect(error.status).to.equal(404);
         });
     });
 
diff --git a/tests/integration/api/rate-limit.spec.js b/tests/integration/api/rate-limit.spec.js
index 677ff00bf2e..f7bb6791404 100644
--- a/tests/integration/api/rate-limit.spec.js
+++ b/tests/integration/api/rate-limit.spec.js
@@ -18,7 +18,7 @@ describe('rate limit', () => {
       await requestThat401s();
       expect.fail('should have been rate limited');
     } catch (e) {
-      expect(e.statusCode).to.equal(429);
+      expect(e.status).to.equal(429);
     }
 
     await new Promise((resolve) => {
@@ -30,7 +30,7 @@ describe('rate limit', () => {
       expect.fail('should have rejected due to no auth');
     } catch (e) {
       // the rate limit period has passed, so we're back to 401s
-      expect(e.statusCode).to.equal(401);
+      expect(e.status).to.equal(401);
     }
   });
  
diff --git a/tests/integration/api/routing.spec.js b/tests/integration/api/routing.spec.js
index dcbbad60fc4..affb0cae7cb 100644
--- a/tests/integration/api/routing.spec.js
+++ b/tests/integration/api/routing.spec.js
@@ -142,9 +142,9 @@ describe('routing', () => {
             .request(options)
             .catch(err => err)
             .then(result => {
-              expect(result.statusCode).to.equal(401);
-              expect(result.response.headers['logout-authorization']).to.equal('CHT-Core API');
-              expect(result.responseBody.error).to.equal('unauthorized');
+              expect(result.status).to.equal(401);
+              expect(result.headers.get('logout-authorization')).to.equal('CHT-Core API');
+              expect(result.body.error).to.equal('unauthorized');
             });
         });
       });
@@ -234,12 +234,12 @@ describe('routing', () => {
         results.forEach((result, idx) => {
           if (idx === 0) {
             // online user request
-            expect(result.statusCode).to.equal(404);
-            expect(result.responseBody.error).to.equal('not_found');
+            expect(result.status).to.equal(404);
+            expect(result.body.error).to.equal('not_found');
           } else {
             // offline user requests
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -275,12 +275,12 @@ describe('routing', () => {
         results.forEach((result, idx) => {
           if (idx === 0) {
             // online user request
-            expect(result.statusCode).to.equal(404);
-            expect(result.responseBody.error).to.equal('not_found');
+            expect(result.status).to.equal(404);
+            expect(result.body.error).to.equal('not_found');
           } else {
             // offline user requests
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -317,12 +317,12 @@ describe('routing', () => {
         results.forEach((result, idx) => {
           if (idx === 0) {
             // online user request
-            expect(result.statusCode).to.equal(404);
-            expect(result.responseBody.error).to.equal('not_found');
+            expect(result.status).to.equal(404);
+            expect(result.body.error).to.equal('not_found');
           } else {
             // offline user requests
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -363,8 +363,8 @@ describe('routing', () => {
             expect(result.docs.length).to.be.above(0);
           } else {
             // offline user request
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -403,11 +403,11 @@ describe('routing', () => {
           if (idx === 0) {
             // online user request
             expect(result.limit).to.equal(1);
-            expect(result.fields).to.equal('all_fields');
+            expect(result.fields).to.deep.equal([]);
           } else {
             // offline user requests
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -444,8 +444,8 @@ describe('routing', () => {
             expect(result.indexes.length).to.equal(1);
           } else {
             // offline user request
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -488,8 +488,8 @@ describe('routing', () => {
             expect(result.ok).to.equal(true);
           } else {
             // offline user request
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -522,11 +522,11 @@ describe('routing', () => {
         results.forEach((result, idx) => {
           if (idx === 0) {
             // online user request
-            expect(result.statusCode).to.be.undefined;
+            expect(result.status).to.be.undefined;
           } else {
             // offline user requests
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           }
         });
       });
@@ -559,8 +559,8 @@ describe('routing', () => {
           .catch(err => err)
       ]).then(results => {
         results.forEach(result => {
-          expect(result.statusCode).to.equal(403);
-          expect(result.responseBody.error).to.equal('forbidden');
+          expect(result.status).to.equal(403);
+          expect(result.body.error).to.equal('forbidden');
         });
       });
     });
@@ -658,8 +658,8 @@ describe('routing', () => {
         ])
         .then(results => {
           results.forEach(result => {
-            expect(result.statusCode).to.equal(403);
-            expect(result.responseBody.error).to.equal('forbidden');
+            expect(result.status).to.equal(403);
+            expect(result.body.error).to.equal('forbidden');
           });
         });
     });
@@ -695,8 +695,8 @@ describe('routing', () => {
           .catch(err => err),
       ]).then(results => {
         results.forEach(result => {
-          expect(result.statusCode).to.equal(403);
-          expect(result.responseBody.error).to.equal('forbidden');
+          expect(result.status).to.equal(403);
+          expect(result.body.error).to.equal('forbidden');
         });
       });
     });
@@ -739,17 +739,17 @@ describe('routing', () => {
 
       return createSession()
         .then(res => {
-          expect(res.statusCode).to.equal(200);
-          expect(res.headers['set-cookie'].length).to.equal(1);
-          const sessionCookie = res.headers['set-cookie'][0].split(';')[0];
+          expect(res.status).to.equal(200);
+          expect(res.headers.getSetCookie().length).to.equal(1);
+          const sessionCookie = res.headers.getSetCookie()[0].split(';')[0];
           expect(sessionCookie.split('=')[0]).to.equal('AuthSession');
           return sessionCookie;
         })
         .then(sessionCookie => getSession(sessionCookie))
         .then(res => {
-          expect(res.statusCode).to.equal(200);
-          expect(res.headers['set-cookie'].length).to.equal(1);
-          const [ content, age, path, expires, samesite ] = res.headers['set-cookie'][0].split('; ');
+          expect(res.status).to.equal(200);
+          expect(res.headers.getSetCookie().length).to.equal(1);
+          const [ content, age, path, expires, samesite ] = res.headers.getSetCookie()[0].split('; ');
 
           // check the cookie content is unchanged
           const [ contentKey, contentValue ] = content.split('=');
@@ -827,7 +827,7 @@ describe('routing', () => {
           return utils.requestOnTestDb(_.defaults(params, offlineRequestOptions)).catch(err => err);
         })
         .then(response => {
-          expect(response.statusCode).to.equal(403);
+          expect(response.status).to.equal(403);
         })
         .then(() => {
           const params = {
@@ -838,7 +838,7 @@ describe('routing', () => {
           return utils.requestOnMedicDb(_.defaults(params, offlineRequestOptions)).catch(err => err);
         })
         .then(response => {
-          expect(response.statusCode).to.equal(403);
+          expect(response.status).to.equal(403);
         })
         .then(() => utils.getDoc('settings'))
         .then(settings => {
diff --git a/tests/integration/api/server.spec.js b/tests/integration/api/server.spec.js
index 16c529221c6..bc6d056347c 100644
--- a/tests/integration/api/server.spec.js
+++ b/tests/integration/api/server.spec.js
@@ -1,5 +1,4 @@
 const utils = require('@utils');
-const request = require('request');
 const constants = require('@constants');
 const _ = require('lodash');
 const placeFactory = require('@factories/cht/contacts/place');
@@ -15,80 +14,61 @@ describe('server', () => {
         json: false
       };
 
-      return utils.requestOnTestDb(opts, true)
+      return utils.requestOnTestDb(opts)
         .then(() => expect.fail('should have thrown'))
         .catch(e => {
-          expect(e.responseBody).to.equal('Content-Type must be application/json');
+          expect(e.body).to.equal('Content-Type must be application/json');
         });
     });
   });
 
   describe('response compression', () => {
-    const requestWrapper = (options) => {
-      _.defaults(options, {
-        auth: {
-          sendImmediately: true,
-          username: constants.USERNAME,
-          password: constants.PASSWORD
-        },
-        method: 'GET',
-        baseUrl: constants.BASE_URL + '/' + constants.DB_NAME,
-        uri: '/',
-        gzip: true
-      });
+    const requestWrapper = async (options) => {
+      const opts =  { path: '/', gzip: true, resolveWithFullResponse: true, ...options };
 
-      return new Promise((resolve, reject) => {
-        request(options, (err, res, body) => {
-          if (err) {
-            return reject(err);
-          }
-
-          if (res.headers['content-type'] === 'application/json' && typeof body === 'string') {
-            try {
-              body = JSON.parse(body);
-            } catch (err) {
-              // an error occured when trying parse 'body' to Object
-            }
-          }
-
-          resolve({ res, body });
-        });
-      });
+      const res = await utils.request(opts);
+      return { res, body: res.body };
     };
 
     it('compresses proxied CouchDB application/json requests which send accept-encoding gzip headers', () => {
-      const options = { uri: '/_all_docs' };
+      const options = { path: '/medic/_all_docs' };
 
       return requestWrapper(options).then(({res}) => {
-        expect(res.headers['content-encoding']).to.equal('gzip');
-        expect(res.headers['content-type']).to.equal('application/json');
+        expect(res.headers.get('content-encoding')).to.equal('gzip');
+        expect(res.headers.get('content-type')).to.equal('application/json');
       });
     });
 
     it('compresses proxied CouchDB application/json requests which send accept-encoding deflate headers', () => {
-      const options = { uri: '/_all_docs', gzip: false, headers: { 'Accept-Encoding': 'deflate' } };
+      const options = {
+        path: '/medic/_all_docs',
+        gzip: false,
+        headers: { 'Accept-Encoding': 'deflate' }
+      };
 
       return requestWrapper(options).then(({res}) => {
-        expect(res.headers['content-encoding']).to.equal('deflate');
-        expect(res.headers['content-type']).to.equal('application/json');
+        expect(res.headers.get('content-encoding')).to.equal('deflate');
+        expect(res.headers.get('content-type')).to.equal('application/json');
       });
     });
 
     it('does not compress when no accept-encoding headers are sent', () => {
-      const options = { uri: '/_all_docs', gzip: false };
+      const options = {
+        path: '/medic/_all_docs',
+        gzip: false
+      };
 
       return requestWrapper(options).then(({res}) => {
-        expect(res.headers['content-type']).to.equal('application/json');
-        expect(res.headers['content-encoding']).to.be.undefined;
+        expect(res.headers.get('content-type')).to.equal('application/json');
+        expect(res.headers.get('content-encoding')).to.be.null;
       });
     });
 
     it('compresses audited endpoints responses', () => {
       // compression threshold is 1024B
       const options = {
-        uri: '/_bulk_docs',
+        path: '/medic/_bulk_docs',
         method: 'POST',
-        json: true,
         body: {
           docs: [
             { _id: 'sample_doc' }, { _id: 'sample_doc2' }, { _id: 'sample_doc3' },
@@ -102,9 +82,8 @@ describe('server', () => {
       };
 
       return requestWrapper(options).then(({res, body}) => {
-        expect(res.headers['content-type']).to.equal('application/json');
-        expect(res.headers['content-encoding']).to.equal('gzip');
-        expect(body.length).to.equal(18);
+        expect(res.headers.get('content-type')).to.equal('application/json');
+        expect(res.headers.get('content-encoding')).to.equal('gzip');
         expect(_.omit(body[0], 'rev')).to.eql({ id: 'sample_doc', ok: true });
         expect(_.omit(body[1], 'rev')).to.eql({ id: 'sample_doc2', ok: true });
         expect(_.omit(body[2], 'rev')).to.eql({ id: 'sample_doc3', ok: true });
@@ -116,22 +95,28 @@ describe('server', () => {
         .getDoc('sample_doc')
         .then(doc => {
           const options = {
-            uri: '/sample_doc/attach?rev=' + doc._rev,
+            path: '/medic/sample_doc/attach',
             body: 'my-attachment-content',
             headers: { 'Content-Type': 'text/plain' },
-            method: 'PUT'
+            method: 'PUT',
+            json: false,
+            qs: { rev: doc._rev }
           };
 
           return requestWrapper(options);
         })
         .then(({body}) => {
-          const options = { uri: '/sample_doc/attach?rev=' + body.rev};
+          const options = {
+            path: '/medic//sample_doc/attach',
+            json: false,
+            qs: { rev: body.rev }
+          };
 
           return requestWrapper(options);
         })
         .then(({res, body}) => {
-          expect(res.headers['content-type']).to.equal('text/plain');
-          expect(res.headers['content-encoding']).to.equal('gzip');
+          expect(res.headers.get('content-type')).to.equal('text/plain');
+          expect(res.headers.get('content-encoding')).to.equal('gzip');
           expect(body).to.equal('my-attachment-content');
         });
     });
@@ -144,22 +129,27 @@ describe('server', () => {
         .getDoc('sample_doc2')
         .then(doc => {
           const options = {
-            uri: '/sample_doc2/attach?rev=' + doc._rev,
+            path: '/medic/sample_doc2/attach',
             body: xml,
+            json: false,
             headers: { 'Content-Type': 'application/xml' },
-            method: 'PUT'
+            method: 'PUT',
+            qs: { rev: doc._rev }
           };
 
           return requestWrapper(options);
         })
         .then(({body}) => {
-          const options = { uri: '/sample_doc2/attach?rev=' + body.rev};
+          const options = {
+            path: '/medic/sample_doc2/attach',
+            qs: { rev: body.rev }
+          };
 
           return requestWrapper(options);
         })
         .then(({res, body}) => {
-          expect(res.headers['content-type']).to.equal('application/xml');
-          expect(res.headers['content-encoding']).to.equal('gzip');
+          expect(res.headers.get('content-type')).to.equal('application/xml');
+          expect(res.headers.get('content-encoding')).to.equal('gzip');
           expect(body).to.equal(xml);
         });
     });
@@ -170,16 +160,21 @@ describe('server', () => {
                   '<name>Person 1.1.2.1</name></contact></parent></contact>';
       const doc = await utils.getDoc('sample_doc2');
       const options = {
-        uri: '/sample_doc2/attach?rev='+doc._rev,
+        path: '/medic/sample_doc2/attach',
         body: png,
         headers: { 'Content-Type': 'image/png' },
-        method: 'PUT'
+        method: 'PUT',
+        qs: { rev: doc._rev },
       };
       const { body } = await requestWrapper(options);
-      const getAttachmentOptions = { uri: '/sample_doc2/attach?rev=' + body.rev };
+      const getAttachmentOptions = {
+        path: '/medic/sample_doc2/attach',
+        qs: { rev: body.rev },
+        json: false,
+      };
       const { res, body: attachmentBody } = await requestWrapper(getAttachmentOptions);
-      expect(res.headers[ 'content-type' ]).to.equal('image/png');
-      expect(res.headers[ 'content-encoding' ]).to.be.undefined;
+      expect(res.headers.get('content-type')).to.equal('image/png');
+      expect(res.headers.get('content-encoding')).to.be.null;
       expect(attachmentBody).to.equal(png);
     });
   });
@@ -430,4 +425,28 @@ describe('server', () => {
     });
 
   });
+
+  describe('api startup', () => {
+    it('should start up with broken forms', async () => {
+      const waitForLogs = await utils.waitForApiLogs(/Failed to update xform/);
+
+      const formName = 'broken';
+      const formDoc = {
+        _id: `form:${formName}`,
+        title: formName,
+        type: 'form',
+        _attachments: {
+          xml: {
+            content_type: 'application/octet-stream',
+            data: btoa('this is totally not an xml'),
+          },
+        },
+      };
+      await utils.db.put(formDoc); // don't use utils.saveDoc because that actually waits for good forms
+      await waitForLogs.promise;
+
+      await utils.stopApi();
+      await utils.startApi();
+    }); 
+  });
 });
diff --git a/tests/integration/cht-form/default/person-edit.wdio-spec.js b/tests/integration/cht-form/default/person-edit.wdio-spec.js
index 9220a09228b..f40bf01dfcd 100644
--- a/tests/integration/cht-form/default/person-edit.wdio-spec.js
+++ b/tests/integration/cht-form/default/person-edit.wdio-spec.js
@@ -40,9 +40,6 @@ describe('cht-form web component - Edit Person Form', () => {
             created_by_place_uuid: ''
           }
         },
-        meta: {
-          instanceID: 'uuid:c558e232-0951-4ed8-8392-5ed8ac3c81b3'
-        }
       };
     });
 
diff --git a/tests/integration/cht-form/wdio.conf.js b/tests/integration/cht-form/wdio.conf.js
index 2d89f9daa43..29799c128d6 100644
--- a/tests/integration/cht-form/wdio.conf.js
+++ b/tests/integration/cht-form/wdio.conf.js
@@ -11,6 +11,17 @@ const logPath = path.join('tests', 'logs');
 const browserLogPath = path.join(logPath, 'browser.console.log');
 const mockConfig = require('./mock-config');
 
+const ALLOWED_LOG_MSGS = [
+  'favicon.ico - Failed to load resource: the server responded with a status of 404 (Not Found)',
+  'tag was parsed inside of a <select> which was not inserted into the document. This is not valid ' +
+  'HTML and the behavior may be changed in future versions of chrome.',
+  'invalid phone number',
+  'Error submitting form data:'
+];
+const notAllowedLog = (msg) => {
+  return !ALLOWED_LOG_MSGS.some(allowedMsg => msg.includes(allowedMsg));
+};
+
 // Override specific properties from wdio base config
 const defaultConfig = {
   ...wdioBaseConfig.config,
@@ -48,7 +59,14 @@ const defaultConfig = {
     mockConfig.stopMockApp();
   },
 
-  afterTest: () => { },
+  afterTest: async (test) => {
+    const logs = (await browser.getLogs('browser'))
+      .map(({ message }) => message)
+      .filter(notAllowedLog);
+    if (logs.length) {
+      test.callback(new Error(`Browser console logs are not empty: ${logs.join('\n')}`));
+    }
+  },
 
   onComplete: () => { },
 };
diff --git a/tests/integration/infodocs/infodocs.spec.js b/tests/integration/infodocs/infodocs.spec.js
index bf2827a007b..c49848bd0d2 100644
--- a/tests/integration/infodocs/infodocs.spec.js
+++ b/tests/integration/infodocs/infodocs.spec.js
@@ -58,7 +58,7 @@ describe('infodocs', () => {
       await utils.requestOnTestDb({ path, method, body: doc });
       assert.fail('request should fail with conflict');
     } catch (err) {
-      assert.equal(err.statusCode, 409);
+      assert.equal(err.status, 409);
     }
 
     const [newInfoDoc] = await delayedInfoDocsOf(doc._id);
@@ -70,8 +70,7 @@ describe('infodocs', () => {
 
     await utils.requestOnTestDb({ path, method, body: doc });
 
-    await utils.stopSentinel();
-    await utils.startSentinel(true);
+    await utils.runSentinelTasks();
 
     const waitForLogs = await utils.waitForSentinelLogs(false, /Task backgroundCleanup completed/);
     await waitForLogs.promise;
@@ -148,12 +147,12 @@ describe('infodocs', () => {
         }
       };
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       const result = await utils.db.post(testDoc);
       testDoc._rev = result.rev;
 
       await utils.setTransitionSeqToNow();
-      await utils.startSentinel(true);
+      await utils.toggleSentinelTransitions();
 
       testDoc.data = 'data changed';
       await utils.saveDoc(testDoc);
@@ -181,7 +180,7 @@ describe('infodocs', () => {
         latest_replication_date: 2000
       };
 
-      await utils.stopSentinel();
+      await utils.toggleSentinelTransitions();
       const result = await utils.db.post(testDoc);
       testDoc._rev = result.rev;
       testDoc._id = result.id;
@@ -191,7 +190,7 @@ describe('infodocs', () => {
 
       await utils.db.put(legacyInfodoc);
       await utils.setTransitionSeqToNow();
-      await utils.startSentinel(true);
+      await utils.toggleSentinelTransitions();
 
       testDoc.data = 'data changed';
       await utils.saveDoc(testDoc);
diff --git a/tests/integration/medic-collect/medic-collect.spec.js b/tests/integration/medic-collect/medic-collect.spec.js
index d8e9c0d72df..e40bb3e40aa 100644
--- a/tests/integration/medic-collect/medic-collect.spec.js
+++ b/tests/integration/medic-collect/medic-collect.spec.js
@@ -1,6 +1,4 @@
 const assert = require('chai').assert;
-const constants = require('@constants');
-const request = require('request-promise-native');
 const utils = require('@utils');
 const host = 'localhost';
 const db = utils.db;
@@ -37,19 +35,15 @@ describe('medic-collect', () => {
   describe('without User-Agent header', () => {
     it('is prompted for auth details if not supplied', () => {
       return getForms({ auth: false, userAgent: false })
-        .then(() => {
-          assert.fail('should fail the request');
-        })
-        .catch(err => {
-          assert.equal(err.statusCode, 401);
-          assert.equal(err.response.headers['www-authenticate'], 'Basic realm="Medic Web Services"');
+        .then(err => {
+          assert.equal(err.status, 401);
         });
     });
 
     it('can fetch a list of forms', () => {
       return getForms({ auth: true, userAgent: false })
         .then(res => {
-          assert.equal(res.statusCode, 200);
+          assert.equal(res.status, 200);
           assert.equal(res.body, MY_COLLECT_FORM_RESPONSE);
         });
     });
@@ -58,19 +52,15 @@ describe('medic-collect', () => {
   describe('with User-Agent header', () => {
     it('is prompted for auth details if not supplied', () => {
       return getForms({ auth: false, userAgent: true })
-        .then(() => {
-          assert.fail('should fail the request');
-        })
-        .catch(err => {
-          assert.equal(err.statusCode, 401);
-          assert.equal(err.response.headers['www-authenticate'], 'Basic realm="Medic Web Services"');
+        .then(err => {
+          assert.equal(err.status, 401);
         });
     });
 
     it('can fetch a list of forms', () => {
       return getForms({ auth: true, userAgent: true })
         .then(res => {
-          assert.equal(res.statusCode, 200);
+          assert.equal(res.status, 200);
           assert.equal(res.body, MY_COLLECT_FORM_RESPONSE);
         });
     });
@@ -78,8 +68,6 @@ describe('medic-collect', () => {
 });
 
 const getForms = ({ auth, userAgent }) => {
-  const url = auth ? constants.BASE_URL_AUTH : constants.BASE_URL;
-
   const headers = {
     'X-OpenRosa-Version': '1.0',
     Date: new Date().toISOString(),
@@ -90,10 +78,11 @@ const getForms = ({ auth, userAgent }) => {
       'org.medicmobile.collect.android/SNAPSHOT';
   }
 
-  return request.get({
-    url: `${url}/api/v1/forms`,
+  return utils.request({
+    path: `/api/v1/forms`,
     headers,
-    resolveWithFullResponse: true
+    resolveWithFullResponse: true,
+    noAuth: !auth,
   });
 };
 
diff --git a/tests/integration/nginx/nginx.spec.js b/tests/integration/nginx/nginx.spec.js
index a661187fb6d..506640e93b7 100644
--- a/tests/integration/nginx/nginx.spec.js
+++ b/tests/integration/nginx/nginx.spec.js
@@ -5,14 +5,14 @@ const constants = require('@constants');
 describe('HTTP request should redirect to HTTPS', () => {
   it('should return a 301 status code and redirect to HTTPS @docker', async () => {
     const [jsonResponse, htmlResponse] = await Promise.all([
-      utils.request({ uri: `http://${constants.API_HOST}/`, followRedirect: false, json: true }).catch(err => err),
-      utils.request({ uri: `http://${constants.API_HOST}/`, followRedirect: false, json: false }).catch(err => err),
+      utils.request({ uri: `http://${constants.API_HOST}/`, redirect: 'manual', json: true, resolveWithFullResponse: true }).catch(err => err),
+      utils.request({ uri: `http://${constants.API_HOST}/`, redirect: 'manual', json: false, resolveWithFullResponse: true }).catch(err => err),
     ]);
 
-    expect(jsonResponse.statusCode).to.be.equal(301);
-    expect(htmlResponse.statusCode).to.be.equal(301);
-    expect(jsonResponse.responseBody.error).to.be.equal('301 Moved Permanently');
-    expect(htmlResponse.responseBody).to.contain('<title>301 Moved Permanently</title>');
+    expect(jsonResponse.status).to.be.equal(301);
+    expect(htmlResponse.status).to.be.equal(301);
+    expect(jsonResponse.body.error).to.be.equal('301 Moved Permanently');
+    expect(htmlResponse.body).to.contain('<title>301 Moved Permanently</title>');
   });
 });
 
@@ -23,10 +23,10 @@ describe('HTTP acme-challenge should not redirect', () => {
       utils.request({ uri: `http://${constants.API_HOST}/.well-known/acme-challenge/`, json: false }).catch(err => err),
     ]);
 
-    expect(jsonResponse.statusCode).to.be.equal(404);
-    expect(htmlResponse.statusCode).to.be.equal(404);
-    expect(jsonResponse.responseBody.error).to.be.equal('404 Not Found');
-    expect(htmlResponse.responseBody).to.contain('<title>404 Not Found</title>');
+    expect(jsonResponse.status).to.be.equal(404);
+    expect(htmlResponse.status).to.be.equal(404);
+    expect(jsonResponse.body.error).to.be.equal('404 Not Found');
+    expect(htmlResponse.body).to.contain('<title>404 Not Found</title>');
   });
 });
 
diff --git a/tests/integration/sentinel/schedules/background-cleanup.spec.js b/tests/integration/sentinel/schedules/background-cleanup.spec.js
index 583bf0d6507..8988676eeff 100644
--- a/tests/integration/sentinel/schedules/background-cleanup.spec.js
+++ b/tests/integration/sentinel/schedules/background-cleanup.spec.js
@@ -50,12 +50,8 @@ describe('Background cleanup', () => {
       body: {docs: userReadDocs}
     });
 
-    // Delete while stopped
-    await utils.stopSentinel();
     await utils.deleteDoc(docToDelete._id);
-
-    // Boot up sentinel again and let the background cleanup finish
-    await utils.startSentinel();
+    await utils.runSentinelTasks();
     await sentinelUtils.waitForBackgroundCleanup();
 
     // Check infodoc deletion
diff --git a/tests/integration/sentinel/schedules/due-tasks.spec.js b/tests/integration/sentinel/schedules/due-tasks.spec.js
index 22f57d54f36..112be9b4420 100644
--- a/tests/integration/sentinel/schedules/due-tasks.spec.js
+++ b/tests/integration/sentinel/schedules/due-tasks.spec.js
@@ -369,9 +369,10 @@ describe('Due Tasks', () => {
 
   it('should process scheduled messages correctly', async () => {
     await sentinelUtils.waitForSentinel();
-    await utils.stopSentinel();
+    await utils.toggleSentinelTransitions();
     await utils.saveDocs(reports);
-    await utils.startSentinel();
+    await utils.toggleSentinelTransitions();
+    await utils.runSentinelTasks();
     await sentinelUtils.waitForSentinel(ids);
     // we can't reliably *know* when the scheduler has finished processing the docs,
     // so I'm just waiting for the revs to change
diff --git a/tests/integration/sentinel/schedules/outbound.spec.js b/tests/integration/sentinel/schedules/outbound.spec.js
index e3ea78b3176..b90be7790cb 100644
--- a/tests/integration/sentinel/schedules/outbound.spec.js
+++ b/tests/integration/sentinel/schedules/outbound.spec.js
@@ -116,9 +116,8 @@ describe('Outbound', () => {
       .then(() => utils.saveDocs(docs))
       // pushes will fail if destination server is not up, so tasks will get created
       .then(() => waitForPushes(3))
-      .then(() => utils.stopSentinel())
       .then(() => server = destinationApp.listen(port)) // and they will generate tasks
-      .then(() => utils.startSentinel())
+      .then(() => utils.runSentinelTasks())
       // waiting for 1 task left should imply that the first task, which should stay because it points
       // to a broken endpoint, has executed, since the second task has executed successfully and been
       // deleted
diff --git a/tests/integration/sentinel/schedules/purging.spec.js b/tests/integration/sentinel/schedules/purging.spec.js
index e2d7948ad86..de89c948b1c 100644
--- a/tests/integration/sentinel/schedules/purging.spec.js
+++ b/tests/integration/sentinel/schedules/purging.spec.js
@@ -390,7 +390,6 @@ const getPurgeLog = () => {
 };
 
 const getDocIds = docs => docs.map(doc => doc.id);
-const restartSentinel = () => utils.stopSentinel().then(() => utils.startSentinel());
 
 const updateUser = async user => {
   const opts = {
@@ -422,7 +421,6 @@ describe('Server side purge', () => {
   it('should purge correct docs', async () => {
     const seq = await sentinelUtils.getCurrentSeq();
     await utils.updateSettings({ purge: purgeSettings }, { ignoreReload: true });
-    await restartSentinel();
     await sentinelUtils.waitForPurgeCompletion(seq);
 
     const purgeLog = await getPurgeLog();
@@ -504,7 +502,6 @@ describe('Server side purge', () => {
         purgeSettings.fn = reversePurgeFn.toString();
         return utils.updateSettings({ purge: purgeSettings }, { ignoreReload: true });
       })
-      .then(() => restartSentinel())
       .then(() => sentinelUtils.waitForPurgeCompletion(seq))
       .then(() => Promise.all([requestDeletes('user1', purgedIdsUser1), requestDeletes('user2', purgedIdsUser2)]))
       .then(([purgedDocsUser1, purgedDocsUser2]) => {
@@ -542,7 +539,6 @@ describe('Server side purge', () => {
     const seq = await sentinelUtils.getCurrentSeq();
     purgeSettings.fn = purgeFn.toString();
     await utils.updateSettings({ purge: purgeSettings }, { ignoreReload: true });
-    await restartSentinel();
     await sentinelUtils.waitForPurgeCompletion(seq);
 
     let responseDocsUser1 = await requestDocs('user1');
diff --git a/tests/integration/sentinel/schedules/reminders.spec.js b/tests/integration/sentinel/schedules/reminders.spec.js
index 90491dc4d54..069cdaaf210 100644
--- a/tests/integration/sentinel/schedules/reminders.spec.js
+++ b/tests/integration/sentinel/schedules/reminders.spec.js
@@ -200,8 +200,6 @@ const assertReminder = ({ form, reminder, place, message }) => {
   });
 };
 
-const restartSentinel = () => utils.stopSentinel().then(() => utils.startSentinel());
-
 describe('reminders', () => {
   before(() => {
     return utils
@@ -219,7 +217,8 @@ describe('reminders', () => {
     let reminder2Date;
     let reminder2Date2;
     let reminder2Date3;
-    return restartSentinel()
+    return utils
+      .runSentinelTasks()
       .then(() => getReminderLogs(2))
       .then(({ rows: reminderLogs }) => {
         chai.expect(reminderLogs[0].id.startsWith('reminderlog:FORM1:')).to.be.true;
@@ -278,7 +277,7 @@ describe('reminders', () => {
           { ignoreReload: true }
         );
       })
-      .then(() => restartSentinel())
+      .then(() => utils.runSentinelTasks())
       .then(() => getReminderLogs(3))
       .then(({ rows: reminderLogs }) => {
         // Only the 2nd reminder ran. Because reminders are executed in a series, we know that 1st reminder was skipped
@@ -381,7 +380,7 @@ describe('reminders', () => {
           { ignoreReload: true }
         );
       })
-      .then(() => restartSentinel())
+      .then(() => utils.runSentinelTasks())
       .then(() => getReminderLogs(4))
       .then(({ rows: reminderLogs }) => {
         chai.expect(reminderLogs).to.have.lengthOf(4);
diff --git a/tests/integration/sentinel/transitions/create-user-for-contacts.spec.js b/tests/integration/sentinel/transitions/create-user-for-contacts.spec.js
index d534d67137e..efbe2d564e7 100644
--- a/tests/integration/sentinel/transitions/create-user-for-contacts.spec.js
+++ b/tests/integration/sentinel/transitions/create-user-for-contacts.spec.js
@@ -47,10 +47,10 @@ const loginAsUser = ({ username, password }) => {
   const opts = {
     path: '/medic/login',
     method: 'POST',
-    simple: false,
+    resolveWithFullResponse: true,
     noAuth: true,
     body: { user: username, password },
-    followRedirect: false,
+    redirect: 'manual',
   };
   return utils.request(opts);
 };
@@ -124,7 +124,7 @@ describe('create_user_for_contacts', () => {
     await utils.createUsers([ORIGINAL_USER]);
     newUsers.push(ORIGINAL_USER.username);
     // Can log in as user
-    assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 302 });
+    assert.include(await loginAsUser(ORIGINAL_USER), { status: 302 });
     await utils.saveDoc(NEW_PERSON);
     // Write another contact that has a user being created and another user being replaced
     // (This is an approximation of behavior that could happen if Sentinel was down when the
@@ -154,11 +154,11 @@ describe('create_user_for_contacts', () => {
     // Transition successful
     assert.isTrue(transitions.create_user_for_contacts.ok);
     // Can no longer log in as user
-    assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 401 });
+    assert.include(await loginAsUser(ORIGINAL_USER), { status: 401 });
     // User's password was automatically reset. Change it to something we know.
     await updateUserPassword(ORIGINAL_USER.username, 'n3wPassword!');
     // Can still login as original user with new password
-    assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { statusCode: 302 });
+    assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { status: 302 });
 
     // New replacement user created
     const [newUserSettings, ...additionalUsers] = await utils.getUserSettings({ contactId: NEW_PERSON._id });
@@ -217,7 +217,7 @@ describe('create_user_for_contacts', () => {
       await utils.createUsers([ORIGINAL_USER]);
       newUsers.push(ORIGINAL_USER.username);
       // Can log in as user
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 302 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 302 });
       await utils.saveDoc(NEW_PERSON);
       const originalContact = await utils.getDoc(ORIGINAL_PERSON._id);
       originalContact.user_for_contact = {
@@ -235,11 +235,11 @@ describe('create_user_for_contacts', () => {
       // Transition successful
       assert.isTrue(transitions.create_user_for_contacts.ok);
       // Can no longer log in as user
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 401 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 401 });
       // User's password was automatically reset. Change it to something we know.
       await updateUserPassword(ORIGINAL_USER.username, 'n3wPassword!');
       // Can still login as original user with new password
-      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { statusCode: 302 });
+      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { status: 302 });
 
       // New user created
       const [newUserSettings, ...additionalUsers] = await utils.getUserSettings({ contactId: NEW_PERSON._id });
@@ -273,7 +273,7 @@ describe('create_user_for_contacts', () => {
       await utils.createUsers([otherUser]);
       newUsers.push(otherUser.username);
       // Can log in as user
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 302 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 302 });
       await utils.saveDoc(NEW_PERSON);
       const originalContact = await utils.getDoc(ORIGINAL_PERSON._id);
       originalContact.user_for_contact = {
@@ -291,11 +291,11 @@ describe('create_user_for_contacts', () => {
       // Transition successful
       assert.isTrue(transitions.create_user_for_contacts.ok);
       // Can no longer log in as user
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 401 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 401 });
       // User's password was automatically reset. Change it to something we know.
       await updateUserPassword(ORIGINAL_USER.username, 'n3wPassword!');
       // Can still login as original user with new password
-      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { statusCode: 302 });
+      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { status: 302 });
       // New user created
       const [newUserSettings, ...additionalUsers] = await utils.getUserSettings({ contactId: NEW_PERSON._id });
       assert.isEmpty(additionalUsers);
@@ -323,7 +323,7 @@ describe('create_user_for_contacts', () => {
       const [otherUserSettings] = await utils.getUserSettings({ name: otherUser.username });
       assert.equal(otherUserSettings.contact_id, ORIGINAL_PERSON._id);
       // Can still log in as other user
-      assert.include(await loginAsUser(otherUser), { statusCode: 302 });
+      assert.include(await loginAsUser(otherUser), { status: 302 });
     });
 
     it('replaces multiple users for a contact', async () => {
@@ -334,8 +334,8 @@ describe('create_user_for_contacts', () => {
       await utils.createUsers([otherUser]);
       newUsers.push(otherUser.username);
       // Can log in as users
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 302 });
-      assert.include(await loginAsUser(otherUser), { statusCode: 302 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 302 });
+      assert.include(await loginAsUser(otherUser), { status: 302 });
       await utils.saveDoc(NEW_PERSON);
       const originalContact = await utils.getDoc(ORIGINAL_PERSON._id);
       originalContact.user_for_contact = {
@@ -357,14 +357,14 @@ describe('create_user_for_contacts', () => {
       // Transition successful
       assert.isTrue(transitions.create_user_for_contacts.ok);
       // Can no longer log in as users
-      assert.include(await loginAsUser(ORIGINAL_USER), { statusCode: 401 });
-      assert.include(await loginAsUser(otherUser), { statusCode: 401 });
+      assert.include(await loginAsUser(ORIGINAL_USER), { status: 401 });
+      assert.include(await loginAsUser(otherUser), { status: 401 });
       // User's password was automatically reset. Change it to something we know.
       await updateUserPassword(ORIGINAL_USER.username, 'n3wPassword!');
       await updateUserPassword(otherUser.username, 'n3wPassword!');
       // Can still login as original user with new password
-      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { statusCode: 302 });
-      assert.include(await loginAsUser({ ...otherUser, password: 'n3wPassword!' }), { statusCode: 302 });
+      assert.include(await loginAsUser({ ...ORIGINAL_USER, password: 'n3wPassword!' }), { status: 302 });
+      assert.include(await loginAsUser({ ...otherUser, password: 'n3wPassword!' }), { status: 302 });
       // New users created
       const [newUserSettings0, newUserSettings1, ...additionalUsers] =
         await utils.getUserSettings({ contactId: NEW_PERSON._id });
diff --git a/tests/integration/sentinel/transitions/update-scheduled-reports.spec.js b/tests/integration/sentinel/transitions/update-scheduled-reports.spec.js
index ff06b9ac2b4..c53183c5fee 100644
--- a/tests/integration/sentinel/transitions/update-scheduled-reports.spec.js
+++ b/tests/integration/sentinel/transitions/update-scheduled-reports.spec.js
@@ -289,8 +289,7 @@ describe('update_scheduled_reports', () => {
         expect(updated[3].type).to.equal('data_record');
         expect(updated[4].type).to.equal('data_record');
       })
-      .then(() => utils.stopSentinel())
-      .then(() => utils.startSentinel())
+      .then(() => utils.runSentinelTasks())
       .then(() => sentinelUtils.waitForBackgroundCleanup())
       .then(() => sentinelUtils.getInfoDocs([ doc1._id, doc2._id, doc3._id, doc4._id, doc5._id ]))
       .then(infos => {
diff --git a/tests/page-objects/default/common/common.wdio.page.js b/tests/page-objects/default/common/common.wdio.page.js
index 4c196d6f2f1..88464a95ab0 100644
--- a/tests/page-objects/default/common/common.wdio.page.js
+++ b/tests/page-objects/default/common/common.wdio.page.js
@@ -3,6 +3,7 @@ const modalPage = require('@page-objects/default/common/modal.wdio.page');
 const constants = require('@constants');
 
 const ELEMENT_DISPLAY_PAUSE = 500; // 500ms
+const RELOAD_SYNC_TIMEOUT = 10000;
 
 const tabsSelector = {
   getAllButtonLabels: async () => await $$('.header .tabs .button-label'),
@@ -10,6 +11,7 @@ const tabsSelector = {
   taskTab: () => $('#tasks-tab'),
   analyticsTab: () => $('#analytics-tab'),
 };
+const { generateScreenshot } = require('@utils/screenshots');
 
 const hamburgerMenuSelectors = {
   hamburgerMenu: () => $('aria/Application menu'),
@@ -20,6 +22,7 @@ const hamburgerMenuSelectors = {
   syncSuccess: () => $('aria/All reports synced'),
   syncInProgress: () => $('mat-sidenav-content').$('*="Currently syncing"'),
   aboutButton: () => $('aria/About'),
+  trainingMaterialsButton: () => $('aria/Training materials'),
   userSettingsButton: () => $('aria/User settings'),
   feedbackMenuOption: () => $('aria/Report bug'),
   logoutButton: () => $('aria/Log out'),
@@ -45,6 +48,15 @@ const fabSelectors = {
   fastActionItems: () => $$(`${FAST_ACTION_LIST_CONTAINER} .fast-action-item`),
   reportsFastActionFAB: () => $('#reports-content .fast-action-fab-button mat-icon'),
 };
+const hamburgerMenuItemSelector = 'mat-sidenav-content';
+const logoutButton = () => $('aria/Log out');
+const syncButton = () => $('aria/Sync now');
+const hamburguerMenuItemByOption = (menuOption) => $(hamburgerMenuItemSelector).$(`//span[text()="${menuOption}"]`);
+const messagesTab = () => $('#messages-tab');
+const analyticsTab = () => $('#analytics-tab');
+const getReportsButtonLabel = () => $('#reports-tab .button-label');
+const getMessagesButtonLabel = () => $('#messages-tab .button-label');
+const getTasksButtonLabel = () => $('#tasks-tab .button-label');
 
 const userSettingsSelectors = {
   editProfileButton: () => $('.user .configuration.page i.fa-user'),
@@ -53,17 +65,16 @@ const userSettingsSelectors = {
 const getJsonErrorText = async () => await $('pre').getText();
 
 const isHamburgerMenuOpen = async () => {
-  return await (await $('mat-sidenav-container.mat-drawer-container-has-open')).isExisting();
+  return await (await $('mat-sidenav-container.mat-drawer-container-has-open .mat-drawer-opened')).isDisplayed();
 };
 
 const openHamburgerMenu = async () => {
   if (!(await isHamburgerMenuOpen())) {
+    await closeReloadModal();
     await (await hamburgerMenuSelectors.hamburgerMenu()).waitForClickable();
     await (await hamburgerMenuSelectors.hamburgerMenu()).click();
-    // Adding pause here as we have to wait for sidebar nav menu animation to load
-    await browser.pause(ELEMENT_DISPLAY_PAUSE);
   }
-  await (await hamburgerMenuSelectors.sideBarMenuTitle()).waitForDisplayed();
+  await browser.waitUntil(isHamburgerMenuOpen);
 };
 
 const closeHamburgerMenu = async () => {
@@ -80,15 +91,17 @@ const openMoreOptionsMenu = async () => {
   await (await kebabMenuSelectors.moreOptionsMenu()).click();
 };
 
-const performMenuAction = async (actionSelector) => {
-  await openMoreOptionsMenu();
+const performMenuAction = async (actionSelector, isOptionsMenuOpen = false) => {
+  if (!isOptionsMenuOpen){
+    await openMoreOptionsMenu();
+  }
   const actionElement = await actionSelector();
   await actionElement.waitForClickable();
   await actionElement.click();
 };
 
-const accessEditOption = async () => {
-  await performMenuAction(kebabMenuSelectors.edit);
+const accessEditOption = async (isOptionsMenuOpen = false) => {
+  await performMenuAction(kebabMenuSelectors.edit, isOptionsMenuOpen);
 };
 
 const accessDeleteOption = async () => {
@@ -103,6 +116,17 @@ const accessReviewOption = async () => {
   await performMenuAction(kebabMenuSelectors.review);
 };
 
+const toggleMenuAndCaptureScreenshot = async (menuOption, reverse, pageName, screenshotName) => {
+  await openHamburgerMenu();
+  await hamburguerMenuItemByOption(menuOption).waitForClickable({ reverse });
+  await generateScreenshot(pageName, screenshotName);
+  if (reverse) {
+    await closeHamburgerMenu();
+  } else {
+    await hamburguerMenuItemByOption(menuOption).click();
+  }
+};
+
 const waitForSnackbarToClose = async () => {
   const snackbar = await $('#snackbar.active .snackbar-message');
   if (await snackbar.isExisting()) {
@@ -265,11 +289,13 @@ const isReportsListPresent = () => isElementPresent('#reports-list');
 
 const isPeopleListPresent = () => isElementPresent('#contacts-list');
 
+const isContactTabPresent = () => isElementPresent('#contacts-tab');
+
 const isTargetMenuItemPresent = () => isElementPresent('=Target');
 
 const isTargetAggregatesMenuItemPresent = () => isElementPresent('=Target aggregates');
 
-const isMoreOptionsMenuPresent = async () => await (await kebabMenuSelectors.moreOptionsMenu()).isExisting();
+const isMoreOptionsMenuPresent = async () => await (await kebabMenuSelectors.moreOptionsMenu()).isDisplayed();
 
 const navigateToLogoutModal = async () => {
   await openHamburgerMenu();
@@ -344,13 +370,20 @@ const goToAnalytics = async () => {
   await waitForPageLoaded();
 };
 
-const closeReloadModal = async (shouldUpdate = false, timeout = 5000) => {
+const closeReloadModal = async (shouldUpdate, timeout) => {
   try {
-    shouldUpdate ? await modalPage.submit(timeout) : await modalPage.cancel(timeout);
-    shouldUpdate && await waitForAngularLoaded();
+    timeout = timeout || shouldUpdate ? RELOAD_SYNC_TIMEOUT : ELEMENT_DISPLAY_PAUSE;
+    if (shouldUpdate) {
+      await modalPage.submit(timeout);
+      await waitForAngularLoaded();
+    } else {
+      await modalPage.cancel(timeout);
+    }
+
     return true;
   } catch (err) {
-    timeout && console.error('Reload modal has not showed up');
+    (timeout > ELEMENT_DISPLAY_PAUSE) && console.error(err);
+    (timeout > ELEMENT_DISPLAY_PAUSE) && console.error('Reload modal has not showed up');
     return false;
   }
 };
@@ -359,25 +392,29 @@ const syncAndNotWaitForSuccess = async () => {
   await openHamburgerMenu();
   await (await hamburgerMenuSelectors.syncButton()).click();
 };
-
-const syncAndWaitForSuccess = async (timeout = 20000, retry = 10) => {
+const syncAndWaitForSuccess = async (expectReload, timeout = RELOAD_SYNC_TIMEOUT, retry = 10) => {
   if (retry < 0) {
     throw new Error('Failed to sync after 10 retries');
   }
-  await closeReloadModal(false, 0);
-
   try {
     await openHamburgerMenu();
-    if (!await (await hamburgerMenuSelectors.syncInProgress()).isExisting()) {
+    if (!await (await hamburgerMenuSelectors.syncInProgress()).isDisplayedInViewport()) {
       await (await hamburgerMenuSelectors.syncButton()).click();
-      await openHamburgerMenu();
     }
 
     await (await hamburgerMenuSelectors.syncInProgress()).waitForDisplayed({ timeout, reverse: true });
-    await (await hamburgerMenuSelectors.syncSuccess()).waitForDisplayed({ timeout });
+    await browser.waitUntil(async () => {
+      return (await (await hamburgerMenuSelectors.syncSuccess()).isDisplayedInViewport()) ||
+             (await modalPage.isDisplayed());
+    }, { timeout });
+    await openHamburgerMenu();
+
+    if (!await (await hamburgerMenuSelectors.syncSuccess()).isDisplayedInViewport()) {
+      throw new Error('Failed to sync');
+    }
   } catch (err) {
     console.error(err);
-    await syncAndWaitForSuccess(timeout, retry - 1);
+    return await syncAndWaitForSuccess(expectReload, timeout, retry - 1);
   }
 };
 
@@ -391,18 +428,24 @@ const hideModalOverlay = () => {
   });
 };
 
-const sync = async (expectReload, timeout) => {
+const sync = async ({
+  reload = false,
+  expectReload = false,
+  serviceWorkerUpdate = false,
+  timeout = RELOAD_SYNC_TIMEOUT
+} = {}) => {
   await hideModalOverlay();
-  let closedModal = false;
-  if (expectReload) {
-    // it's possible that sync already happened organically, and we already have the reload modal
-    closedModal = await closeReloadModal(false, 0);
-  }
 
-  await syncAndWaitForSuccess(timeout);
-  if (expectReload && !closedModal) {
-    await closeReloadModal();
+  await syncAndWaitForSuccess(expectReload, timeout);
+  // service worker updates require downloading all resources, and then it triggers the update modal.
+  // sometimes this action is not timely with a quick sync.
+  serviceWorkerUpdate && await closeReloadModal(false, RELOAD_SYNC_TIMEOUT);
+
+  if (reload) {
+    await browser.refresh();
+    return await waitForPageLoaded();
   }
+
   await closeHamburgerMenu();
 };
 
@@ -436,6 +479,12 @@ const openUserSettingsAndFetchProperties = async () => {
   await (await userSettingsSelectors.editProfileButton()).waitForDisplayed();
 };
 
+const openTrainingMaterials = async () => {
+  await (await hamburgerMenuSelectors.trainingMaterialsButton()).waitForClickable();
+  await (await hamburgerMenuSelectors.trainingMaterialsButton()).click();
+  await waitForPageLoaded();
+};
+
 const openEditProfile = async () => {
   await (await userSettingsSelectors.editProfileButton()).waitForClickable();
   await (await userSettingsSelectors.editProfileButton()).click();
@@ -505,6 +554,11 @@ const createFormDoc = (path, formId) => {
   };
 };
 
+const reloadSession = async () => {
+  await browser.reloadSession();
+  await browser.url('/');
+};
+
 module.exports = {
   tabsSelector,
   fabSelectors,
@@ -516,9 +570,7 @@ module.exports = {
   accessDeleteOption,
   accessExportOption,
   accessReviewOption,
-  hideSnackbar,
   waitForLoaderToDisappear,
-  waitForLoaders,
   waitForAngularLoaded,
   waitForPageLoaded,
   clickFastActionFAB,
@@ -530,6 +582,21 @@ module.exports = {
   closeFastActionList,
   isReportActionDisplayed,
   isElementPresent,
+  logoutButton,
+  isContactTabPresent,
+  messagesTab,
+  analyticsTab,
+  getReportsButtonLabel,
+  getMessagesButtonLabel,
+  getTasksButtonLabel,
+  hideSnackbar,
+  waitForLoaders,
+  syncButton,
+  toggleMenuAndCaptureScreenshot,
+  closeReloadModal,
+  goToMessages,
+  goToTasks,
+  goToAnalytics,
   isMessagesListPresent,
   isTasksListPresent,
   isPeopleListPresent,
@@ -543,18 +610,15 @@ module.exports = {
   refresh,
   goToBase,
   goToAboutPage,
-  goToMessages,
-  goToTasks,
   goToReports,
   goToPeople,
-  goToAnalytics,
-  closeReloadModal,
   syncAndNotWaitForSuccess,
   sync,
   openReportBugAndFetchProperties,
   closeReportBug,
   openAboutMenu,
   openUserSettings,
+  openTrainingMaterials,
   openUserSettingsAndFetchProperties,
   openEditProfile,
   openAppManagement,
@@ -565,4 +629,5 @@ module.exports = {
   loadNextInfiniteScrollPage,
   getErrorLog,
   createFormDoc,
+  reloadSession,
 };
diff --git a/tests/page-objects/default/common/modal.wdio.page.js b/tests/page-objects/default/common/modal.wdio.page.js
index 95bf50b8ab3..886813c1bee 100644
--- a/tests/page-objects/default/common/modal.wdio.page.js
+++ b/tests/page-objects/default/common/modal.wdio.page.js
@@ -32,6 +32,11 @@ const cancel = async (timeout) => {
   await checkModalHasClosed();
 };
 
+const isDisplayed = async () => {
+  return await (await modal()).isDisplayedInViewport();
+};
+
+
 module.exports = {
   modal,
   body,
@@ -39,4 +44,5 @@ module.exports = {
   cancel,
   getModalDetails,
   checkModalHasClosed,
+  isDisplayed,
 };
diff --git a/tests/page-objects/default/contacts/contacts.wdio.page.js b/tests/page-objects/default/contacts/contacts.wdio.page.js
index c55384273ea..02e6931b0b0 100644
--- a/tests/page-objects/default/contacts/contacts.wdio.page.js
+++ b/tests/page-objects/default/contacts/contacts.wdio.page.js
@@ -19,6 +19,7 @@ const leftPanelSelectors = {
   contentRows: () =>  $$(CONTENT_ROW_SELECTOR),
   contactName: () => $$(`${CONTENT_ROW_SELECTOR} .heading h4 span`),
   contactListLoadingStatus: () => $(`${CONTACT_LIST_SELECTOR} .loading-status`),
+  firstContact: () => $(`${CONTACT_LIST_SELECTOR} li:first-child`),
 };
 
 const rightPanelSelectors = {
@@ -77,6 +78,39 @@ const deathCardSelectors = {
   deathPlace: () => $(`${DEATH_CARD_TEST_ID} div[test-id="contact.profile.death.place"] p.card-field-value`),
 };
 
+const inmunizationCardSelectors = {
+  inmunizationCard: () => $('div[test-id="contact.profile.immunizations"]'),
+};
+
+const editDistrictHospitalSelectors = {
+  primaryContactSearchDropdown: () => $( 'span.select2-selection--single' +
+    '[aria-labelledby^="select2-/data/district_hospital/contact/_id"]'),
+  primaryContactSearchInput: () => $('input.select2-search__field'),
+  primaryContactSearchFirstResult: () => $('.select2-results__option--highlighted'),
+};
+
+const sortMenuSelectors = {
+  sortIcon: () => $('#sort-results'),
+  sortDropdown: () => $('#sort-results-dropdown'),
+  sortMenuItems: () => $$('#sort-results-dropdown a[role="menuitem"]'),
+};
+
+const openSortMenu = async () => {
+  await sortMenuSelectors.sortIcon().waitForClickable();
+  await sortMenuSelectors.sortIcon().click();
+  await sortMenuSelectors.sortDropdown().waitForDisplayed();
+};
+
+const selectSortOrder = async (sortLabel) => {
+  await openSortMenu();
+  const option = await sortMenuSelectors.sortDropdown().$(`a[role="menuitem"]*=${sortLabel}`);
+  if (await option.isExisting()) {
+    await option.click();
+  } else {
+    throw new Error(`Sort option "${sortLabel}" not found`);
+  }
+};
+
 const search = async (query) => {
   if (!await (await searchSelectors.searchBox()).isDisplayed()) {
     await mobileSearchPage.performSearch(query);
@@ -88,7 +122,7 @@ const search = async (query) => {
 const findRowByText = async (text, strict) => {
   for (const row of await leftPanelSelectors.contentRows()) {
     const rowText = await row.getText();
-    if ((strict && rowText === text) || rowText.includes(text)) {
+    if ((strict && rowText === text) || (!strict && rowText.includes(text))) {
       return row;
     }
   }
@@ -366,6 +400,29 @@ const filterReportViewAll = async () => {
   await (await tabsContainer.$('*=View all')).click();
 };
 
+const openFirstContact = async () => {
+  const firstContact = leftPanelSelectors.firstContact();
+  await firstContact.waitForClickable();
+  await firstContact.click();
+};
+
+const openPrimaryContactSearchDropdown = async () => {
+  await editDistrictHospitalSelectors.primaryContactSearchDropdown().waitForClickable();
+  await editDistrictHospitalSelectors.primaryContactSearchDropdown().click();
+};
+
+const inputPrimaryContactSearchValue = async (searchQuery) => {
+  await editDistrictHospitalSelectors.primaryContactSearchInput().waitForDisplayed();
+  await editDistrictHospitalSelectors.primaryContactSearchInput().setValue(searchQuery);
+  await editDistrictHospitalSelectors.primaryContactSearchFirstResult().waitForDisplayed();
+};
+
+const selectPrimaryContactSearchFirstResult = async () => {
+  await editDistrictHospitalSelectors.primaryContactSearchFirstResult().waitForClickable();
+  await editDistrictHospitalSelectors.primaryContactSearchFirstResult().click();
+};
+
+
 module.exports = {
   genericForm,
   leftPanelSelectors,
@@ -375,6 +432,7 @@ module.exports = {
   reportsCardSelectors,
   pregnancyCardSelectors,
   deathCardSelectors,
+  inmunizationCardSelectors,
   selectLHSRowByText,
   selectRHSRowById,
   getReportFiltersText,
@@ -407,4 +465,10 @@ module.exports = {
   getDisplayedContactsNames,
   getCurrentPersonEditFormValues,
   filterReportViewAll,
+  openFirstContact,
+  openPrimaryContactSearchDropdown,
+  inputPrimaryContactSearchValue,
+  selectPrimaryContactSearchFirstResult,
+  openSortMenu,
+  selectSortOrder,
 };
diff --git a/tests/page-objects/default/enketo/common-enketo.wdio.page.js b/tests/page-objects/default/enketo/common-enketo.wdio.page.js
index cd335d2bfd3..9ac02eb075c 100644
--- a/tests/page-objects/default/enketo/common-enketo.wdio.page.js
+++ b/tests/page-objects/default/enketo/common-enketo.wdio.page.js
@@ -95,6 +95,12 @@ const getTextareaValue = async (question) => {
   return await getValue('textarea', question);
 };
 
+const scrollToQuestion = async (label) => {
+  return await (await getCurrentPageSection())
+    .$(`label*=${label}`)
+    .scrollIntoView(false);
+};
+
 const isRequiredMessageDisplayed = async (question) => {
   await formTitle().click();
   const requiredMsg = (await getCurrentPageSection())
@@ -153,4 +159,5 @@ module.exports = {
   addRepeatSection,
   drawShapeOnCanvas,
   isRadioButtonSelected,
+  scrollToQuestion,
 };
diff --git a/tests/page-objects/default/enketo/training-cards.wdio.page.js b/tests/page-objects/default/enketo/training-cards.wdio.page.js
index a88d0579cdb..8726e8e91f9 100644
--- a/tests/page-objects/default/enketo/training-cards.wdio.page.js
+++ b/tests/page-objects/default/enketo/training-cards.wdio.page.js
@@ -1,11 +1,18 @@
 const genericFormPage = require('./generic-form.wdio.page');
 const modalPage = require('@page-objects/default/common/modal.wdio.page');
+const commonElements = require('@page-objects/default/common/common.wdio.page');
 
-const ENKETO_MODAL = '.enketo-modal';
-
-const trainingCardsForm = () => $(ENKETO_MODAL);
+const trainingCardsForm = () => $('#training-cards-form');
 const cardText = (context, field) => $(`.question-label[lang="en"][data-itext-id="/${context}/${field}`);
-const quitTrainingBtn = () => $(`${ENKETO_MODAL} .item-content button[test-id="quit-training"]`);
+const quitTrainingBtn = () => $('.item-content button[test-id="quit-training"]');
+
+const TRAINING_LIST_ID = '#trainings-list';
+const ALL_TRAININGS = `${TRAINING_LIST_ID} li.content-row`;
+const leftPanelSelectors = {
+  allTrainings: () => $$(ALL_TRAININGS),
+  trainingRowsText: () => $$(`${ALL_TRAININGS} .heading h4 span`),
+  trainingByUUID: (uuid) => $(`${TRAINING_LIST_ID} li.content-row[data-record-id="${uuid}"]`),
+};
 
 const waitForTrainingCards = async () => {
   await (await trainingCardsForm()).waitForDisplayed();
@@ -15,6 +22,12 @@ const checkTrainingCardIsNotDisplayed = async () => {
   await (await trainingCardsForm()).waitForDisplayed({ reverse: true });
 };
 
+const getTrainingTitle = async () => {
+  const title = await $('#form-title');
+  await title.waitForDisplayed();
+  return title.getText();
+};
+
 const getCardContent = async (context, field) => {
   return await (await cardText(context, field)).getText();
 };
@@ -35,17 +48,37 @@ const confirmQuitTraining = async () => {
   await modalPage.checkModalHasClosed();
 };
 
-const submitTraining = async () => {
+const submitTraining = async (checkModal = true) => {
   await genericFormPage.submitForm();
-  await modalPage.checkModalHasClosed();
+  if (checkModal) {
+    await modalPage.checkModalHasClosed();
+  }
+};
+
+const openTrainingMaterial = async (formID) => {
+  await (await leftPanelSelectors.trainingByUUID(formID)).waitForClickable();
+  await (await leftPanelSelectors.trainingByUUID(formID)).click();
+};
+
+const getAllTrainingsText = async () => {
+  await (await leftPanelSelectors.allTrainings()[0]).waitForDisplayed();
+  return commonElements.getTextForElements(leftPanelSelectors.trainingRowsText);
+};
+
+const isTrainingComplete = async (formId) => {
+  return (await $(`[data-record-id="${formId}"] .mat-icon-check`)).isExisting();
 };
 
 module.exports = {
   checkTrainingCardIsNotDisplayed,
-  waitForTrainingCards,
+  confirmQuitTraining,
+  getAllTrainingsText,
   getCardContent,
   getNextCardContent,
+  getTrainingTitle,
+  isTrainingComplete,
+  openTrainingMaterial,
   quitTraining,
-  confirmQuitTraining,
   submitTraining,
+  waitForTrainingCards,
 };
diff --git a/tests/page-objects/default/login/login.wdio.page.js b/tests/page-objects/default/login/login.wdio.page.js
index 766689b9588..e61b4fd5f82 100644
--- a/tests/page-objects/default/login/login.wdio.page.js
+++ b/tests/page-objects/default/login/login.wdio.page.js
@@ -59,10 +59,10 @@ const cookieLogin = async (options = {}) => {
     path: '/medic/login',
     body: { user: username, password: password, locale },
     method: 'POST',
-    simple: false,
+    resolveWithFullResponse: true,
   };
   const resp = await utils.request(opts);
-  const cookieArray = utils.parseCookieResponse(resp.headers['set-cookie']);
+  const cookieArray = utils.parseCookieResponse(resp.headers.getSetCookie());
 
   await browser.url('/');
   await browser.setCookies(cookieArray);
diff --git a/tests/page-objects/default/search/search.wdio.page.js b/tests/page-objects/default/search/search.wdio.page.js
index eb7ca9bfb05..d72230a613d 100644
--- a/tests/page-objects/default/search/search.wdio.page.js
+++ b/tests/page-objects/default/search/search.wdio.page.js
@@ -4,9 +4,17 @@ const commonElements = require('@page-objects/default/common/common.wdio.page');
 
 const searchBox = () => $('.mm-search-bar-container input#freetext');
 const resetSearch = () => $('.mm-search-bar-container .search-bar-clear');
+const searchIcon = () => $('.search-bar-left-icon .fa-search');
+
+const ensureSearchInputVisible = async () => {
+  if (!(await searchBox().isDisplayed())) {
+    await (await searchIcon()).click();
+  }
+};
 
 // click freetext search box
 const performSearch = async (searchString) => {
+  await ensureSearchInputVisible();
   await (await searchBox()).click();
   await (await searchBox()).clearValue();
   await (await searchBox()).addValue(searchString);
@@ -25,5 +33,6 @@ const clearSearch = async () => {
 
 module.exports = {
   performSearch,
-  clearSearch
+  clearSearch,
+  ensureSearchInputVisible
 };
diff --git a/tests/page-objects/default/tasks/tasks.wdio.page.js b/tests/page-objects/default/tasks/tasks.wdio.page.js
index c9fc2a98177..3c9ffee7c35 100644
--- a/tests/page-objects/default/tasks/tasks.wdio.page.js
+++ b/tests/page-objects/default/tasks/tasks.wdio.page.js
@@ -12,6 +12,7 @@ const getTaskById = (emissionId) => $(`${TASK_LIST_SELECTOR} li[data-record-id="
 const getTasks = () => $$(`${TASK_LIST_SELECTOR} li.content-row`);
 
 const getTaskInfo = async (taskElement) => {
+  await taskElement.scrollIntoView();
   const contactName = await (await taskElement.$('h4 span')).getText();
   const formTitle = await (await taskElement.$('.summary p')).getText();
   let lineage = '';
diff --git a/tests/page-objects/default/users/user.wdio.page.js b/tests/page-objects/default/users/user.wdio.page.js
index 8da7f95267d..50974276d54 100644
--- a/tests/page-objects/default/users/user.wdio.page.js
+++ b/tests/page-objects/default/users/user.wdio.page.js
@@ -222,6 +222,9 @@ const closeAddUserDialog = async () => {
   await (await cancelButton()).click();
   await (await addUserDialog()).waitForDisplayed({ reverse: true });
 };
+const scrollToRole = async () => {
+  await (await $('#role-select')).scrollIntoView();
+};
 
 module.exports = {
   addUserDialog,
@@ -248,4 +251,6 @@ module.exports = {
   getFailedUploadedUsers,
   backToUserList,
   closeAddUserDialog,
+  scrollToRole,
+  addUserButton,
 };
diff --git a/tests/scalability/package-lock.json b/tests/scalability/package-lock.json
index 007abf5f5e5..1c020fe46f9 100644
--- a/tests/scalability/package-lock.json
+++ b/tests/scalability/package-lock.json
@@ -441,9 +441,9 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2572,9 +2572,9 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "requires": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
diff --git a/tests/utils/allure.js b/tests/utils/allure.js
new file mode 100644
index 00000000000..d8c68645e5b
--- /dev/null
+++ b/tests/utils/allure.js
@@ -0,0 +1,29 @@
+const allure = require('allure-commandline');
+
+const generateReport = () => {
+  const reportError = new Error('Could not generate Allure report');
+  const timeoutError = new Error('Timeout generating report');
+  const generation = allure(['generate', 'allure-results', '--clean']);
+
+  return new Promise((resolve, reject) => {
+    const generationTimeout = setTimeout(
+      () => reject(timeoutError),
+      60 * 1000
+    );
+
+    generation.on('exit', (exitCode) => {
+      clearTimeout(generationTimeout);
+
+      if (exitCode !== 0) {
+        return reject(reportError);
+      }
+
+      console.log('Allure report successfully generated');
+      resolve();
+    });
+  });
+};
+
+module.exports = {
+  generateReport
+};
diff --git a/tests/utils/cht-conf.js b/tests/utils/cht-conf.js
index 7a7456495b2..03f8f9e01cf 100644
--- a/tests/utils/cht-conf.js
+++ b/tests/utils/cht-conf.js
@@ -36,7 +36,7 @@ const initializeConfigDir = async () => {
   await fs.promises.writeFile(eslintPath, JSON.stringify(eslintRules));
 };
 
-const compileNoolsConfig = async ({ tasks, targets, contactSummary }) => {
+const compileNoolsConfig = async ({ tasks, targets, contactSummary, contactSummaryExtras }) => {
   const dir = getDirPath();
 
   if (tasks && fs.existsSync(tasks)) {
@@ -48,6 +48,9 @@ const compileNoolsConfig = async ({ tasks, targets, contactSummary }) => {
   if (contactSummary && fs.existsSync(contactSummary)) {
     fs.copyFileSync(contactSummary, path.join(dir, 'contact-summary.templated.js'));
   }
+  if (contactSummaryExtras && fs.existsSync(contactSummaryExtras)) {
+    fs.copyFileSync(contactSummaryExtras, path.join(dir, 'contact-summary-extras.js'));
+  }
 
   await runCommand('compile-app-settings', dir);
   const appSettings = JSON.parse(fs.readFileSync(path.join(dir, 'app_settings.json'), 'utf-8'));
diff --git a/tests/utils/index.js b/tests/utils/index.js
index fbd2531e798..ad846f714c7 100644
--- a/tests/utils/index.js
+++ b/tests/utils/index.js
@@ -2,11 +2,10 @@
 
 const _ = require('lodash');
 const constants = require('@constants');
-const rpn = require('request-promise-native');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync, spawn, exec } = require('child_process');
 const mustache = require('mustache');
 // by default, mustache escapes slashes, which messes with paths and urls.
 mustache.escape = (text) => text;
@@ -31,6 +30,9 @@ let infrastructure = 'docker';
 const isDocker = () => infrastructure === 'docker';
 const isK3D = () => !isDocker();
 const K3D_DATA_PATH = '/data';
+const K3D_REGISTRY = 'registry.localhost';
+let K3D_REGISTRY_PORT;
+const K3D_REPO = () => `k3d-${K3D_REGISTRY}:${K3D_REGISTRY_PORT}`;
 
 const auth = { username: constants.USERNAME, password: constants.PASSWORD };
 const SW_SUCCESSFUL_REGEX = /Service worker generated successfully/;
@@ -59,21 +61,18 @@ const logsDb = new PouchDB(`${constants.BASE_URL}/${constants.DB_NAME}-logs`, {
 const existingFeedbackDocIds = [];
 const MINIMUM_BROWSER_VERSION = '90';
 const KUBECTL_CONTEXT = `-n ${PROJECT_NAME} --context k3d-${PROJECT_NAME}`;
-const cookieJar = rpn.jar();
-
-// Cookies from the jar will be included on Node `fetch` calls
-global.fetch = require('fetch-cookie').default(global.fetch, cookieJar);
 
 const makeTempDir = (prefix) => fs.mkdtempSync(path.join(path.join(os.tmpdir(), prefix || 'ci-')));
 const env = {
   ...process.env,
   CHT_NETWORK: NETWORK,
   COUCHDB_SECRET: 'monkey',
+  COUCHDB_UUID: 'the_uuid',
 };
 
 const dockerPlatformName = () => {
   try {
-    return JSON.parse(execSync(`docker version --format '{{json .Server.Platform.Name}}'`));
+    return JSON.parse(execSync(`docker version --format '{{json .Server.Platform.Name}}'`).toString());
   } catch (error) {
     console.log('docker version failed. NOTE this error is not relevant if running outside of docker');
     console.log(error.message);
@@ -88,7 +87,7 @@ const isDockerDesktop = () => {
 const dockerGateway = () => {
   const network = isDocker() ? NETWORK : `k3d-${PROJECT_NAME}`;
   try {
-    return JSON.parse(execSync(`docker network inspect ${network} --format='{{json .IPAM.Config}}'`));
+    return JSON.parse(execSync(`docker network inspect ${network} --format='{{json .IPAM.Config}}'`).toString());
   } catch (error) {
     console.log('docker network inspect failed. NOTE this error is not relevant if running outside of docker');
     console.log(error.message);
@@ -134,81 +133,115 @@ const setupUserDoc = (userName = constants.USERNAME, userDoc = userSettings.buil
     });
 };
 
-const getSession = async () => {
-  if (cookieJar.getCookies(constants.BASE_URL).length) {
-    return;
+const randomIp = () => {
+  const section = () => (Math.floor(Math.random() * 255) + 1);
+  return `${section()}.${section()}.${section()}.${section()}`;
+};
+
+const getRequestUri = (options) => {
+  let uri = (options.uri || `${constants.BASE_URL}${options.path}`);
+  if (options.qs) {
+    Object.keys(options.qs).forEach((key) => {
+      if (Array.isArray(options.qs[key])) {
+        options.qs[key] = JSON.stringify(options.qs[key]);
+      }
+    });
+    uri = `${uri}?${new URLSearchParams(options.qs).toString()}`;
   }
 
-  const options = {
-    method: 'POST',
-    uri: `${constants.BASE_URL}/_session`,
-    json: true,
-    body: { name: auth.username, password: auth.password },
-    auth,
-    resolveWithFullResponse: true,
-  };
-  const response = await rpn(options);
-  const setCookie = response.headers?.['set-cookie'];
-  const header = Array.isArray(setCookie) ? setCookie.find(header => header.startsWith('AuthSession')) : setCookie;
-  if (header) {
-    try {
-      cookieJar.setCookie(rpn.cookie(header), constants.BASE_URL);
-    } catch (err) {
-      console.error(err);
-    }
+  return uri;
+};
+
+const setRequestContentType = (options) => {
+  let sendJson = true;
+  if (options.json === false ||
+      (options.headers['Content-Type'] && options.headers['Content-Type'] !== 'application/json')
+  ) {
+    sendJson = false;
+  }
+
+  if (sendJson) {
+    options.headers.Accept = 'application/json';
+    options.headers['Content-Type'] = 'application/json';
+    options.body = JSON.stringify(options.body);
+  }
+
+  return sendJson;
+};
+
+const setRequestEncoding = (options) => {
+  if (options.gzip) {
+    options.headers['Accept-Encoding'] = 'gzip';
+  }
+
+  if (options.gzip === false && !options.headers['Accept-Encoding']) {
+    options.headers['Accept-Encoding'] = 'identity';
   }
 };
 
-const isLoginRequest = options => {
-  return options.path === '/medic/login' && options.body.user !== auth.username;
+const setRequestAuth = (options) => {
+  if (options.noAuth) {
+    return;
+  }
+
+  const auth = options.auth || { username: constants.USERNAME, password: constants.PASSWORD };
+  const basicAuth = btoa(`${auth.username}:${auth.password}`);
+  options.headers.Authorization = `Basic ${basicAuth}`;
 };
 
-const randomIp = () => {
-  const section = () => (Math.floor(Math.random() * 255) + 1);
-  return `${section()}.${section()}.${section()}.${section()}`;
+const getRequestOptions = (options) => {
+  options = typeof options === 'string' ? { path: options } : _.clone(options);
+  options.headers = options.headers || {};
+  options.headers['X-Forwarded-For'] = randomIp();
+
+  const uri = getRequestUri(options);
+  const sendJson = setRequestContentType(options);
+
+  setRequestAuth(options);
+  setRequestEncoding(options);
+
+  return { uri, options, resolveWithFullResponse: options.resolveWithFullResponse, sendJson };
+};
+
+const getResponseBody = async (response, sendJson) => {
+  const receiveJson =  (!response.headers.get('content-type') && sendJson) ||
+                       response.headers.get('content-type')?.startsWith('application/json');
+  return receiveJson ? await response.json() : await response.text();
 };
 
 // First Object is passed to http.request, second is for specific options / flags
 // for this wrapper
-const request = async (options, { debug } = {}) => { //NOSONAR
-  options = typeof options === 'string' ? { path: options } : _.clone(options);
-  if (!options.noAuth && !options.auth && !isLoginRequest(options)) {
-    await getSession();
-    options.jar = cookieJar;
-  } else {
-    options.headers = options.headers || {};
-    options.headers['X-Forwarded-For'] = randomIp();
+const request = async (options, { debug } = {}) => {
+  const  { uri, options: requestInit, resolveWithFullResponse, sendJson } = getRequestOptions(options);
+  if (debug) {
+    console.debug('SENDING REQUEST', JSON.stringify({ ...options, body: null }, null, 2));
   }
-  options.uri = options.uri || `${constants.BASE_URL}${options.path}`;
-  options.json = options.json === undefined ? true : options.json;
+
+  const response = await fetch(uri, requestInit);
+  const responseObj = {
+    ...response,
+    body: await getResponseBody(response, sendJson),
+    status: response.status,
+    ok: response.ok,
+    headers: response.headers
+  };
 
   if (debug) {
-    console.log('SENDING REQUEST');
-    console.log(JSON.stringify(options, null, 2));
+    console.debug('RESPONSE', response.status, response.body);
   }
 
-  options.transform = (body, response, resolveWithFullResponse) => {
-    if (debug) {
-      console.log('RESPONSE');
-      console.log(response.statusCode);
-      console.log(response.body);
-    }
-    // we might get a json response for a non-json request.
-    const contentType = response.headers['content-type'];
-    if (contentType?.startsWith('application/json') && !options.json) {
-      response.body = JSON.parse(response.body);
-    }
-    // return full response if `resolveWithFullResponse` or if non-2xx status code (so errors can be inspected)
-    return resolveWithFullResponse || !(/^2/.test('' + response.statusCode)) ? response : response.body;
-  };
+  if (resolveWithFullResponse) {
+    return responseObj;
+  }
 
-  try {
-    return await rpn(options);
-  } catch (err) {
-    err.responseBody = err?.response?.body;
-    console.warn(`Error with request: ${options.method || 'GET'} ${options.uri} ${err.statusCode}`);
-    throw err;
+  if (response.ok || (response.status > 300 && response.status < 399)) {
+    return responseObj.body;
   }
+
+  console.warn(`Error with request: ${options.method || 'GET'} ${uri} ${responseObj.status}`);
+  const err = new Error(response.error || `${response.status} - ${JSON.stringify(responseObj.body)}`);
+  Object.assign(err, responseObj);
+  throw err;
 };
 
 const requestOnTestDb = (options, debug) => {
@@ -559,14 +592,14 @@ const updateSettings = async (updates, options = {}) => {
   }
   const watcher = ignoreReload && Object.keys(updates).length && await waitForSettingsUpdateLogs(ignoreReload);
   await updateCustomSettings(updates);
-  if (!ignoreReload) {
+  if (!ignoreReload && !sync) {
     return await commonElements.closeReloadModal(true);
   }
   if (watcher) {
     await watcher.promise;
   }
   if (sync) {
-    await commonElements.sync(true);
+    await commonElements.sync({ expectReload: true });
   }
   if (refresh) {
     await browser.refresh();
@@ -846,49 +879,38 @@ const getUserSettings = ({ contactId, name }) => {
     }));
 };
 
-const apiRetry = () => {
-  return new Promise(resolve => {
-    setTimeout(() => {
-      resolve(listenForApi());
-    }, 1000);
-  });
-};
-
 const listenForApi = async () => {
-  console.log('Checking API');
-  try {
-    await request({ path: '/api/info' });
-    console.log('API is up');
-  } catch (err) {
-    console.log('API check failed, trying again in 1 second');
-    console.log(err.message);
-    await apiRetry();
-  }
+  let retryCount = 180;
+  do {
+    try {
+      console.log(`Checking API, retries left ${retryCount}`);
+      return await request({ path: '/api/info' });
+    } catch (err) {
+      console.log('API check failed, trying again in 1 second');
+      console.log(err.message);
+      await delayPromise(1000);
+    }
+  } while (--retryCount > 0);
+  throw new Error('API failed to start after 3 minutes');
 };
 
 const dockerComposeCmd = (params) => {
-  params = params.split(' ').filter(String);
   const composeFiles = COMPOSE_FILES.map(file => ['-f', getTestComposeFilePath(file)]).flat();
-  params.unshift('compose', ...composeFiles, '-p', PROJECT_NAME);
+  params = `docker compose ${composeFiles.join(' ')} -p ${PROJECT_NAME} ${params}`;
 
-  return new Promise((resolve, reject) => {
-    const cmd = spawn('docker', params, { env });
-    const output = [];
-    const log = (data, error) => {
-      data = data.toString();
-      output.push(data);
-      error ? console.error(data) : console.log(data);
-    };
+  return runCommand(params);
+};
 
-    cmd.on('error', (err) => {
-      console.error(err);
-      reject(err);
-    });
-    cmd.stdout.on('data', log);
-    cmd.stderr.on('data', log);
+const sendSignal = async (service, signal) => {
+  const getPIDcmd = `/bin/bash -c "pgrep -n node"`;
+  const killCmd = (pid) => `/bin/bash -c "kill -s ${signal} ${pid.trim()}"`;
+  if (isDocker()) {
+    const pid = await dockerComposeCmd(`exec ${service} ${getPIDcmd}`);
+    return await dockerComposeCmd(`exec ${service} ${killCmd(pid)}`);
+  }
 
-    cmd.on('close', () => resolve(output));
-  });
+  const pid = await runCommand(`kubectl ${KUBECTL_CONTEXT} exec deployments/cht-${service} -- ${getPIDcmd}`);
+  await runCommand(`kubectl ${KUBECTL_CONTEXT} exec deployments/cht-${service} -- ${killCmd(pid)}`);
 };
 
 const stopService = async (service) => {
@@ -900,7 +922,7 @@ const stopService = async (service) => {
   let tries = 100;
   do {
     try {
-      await getPodName(service, true);
+      await getPodName(service, false);
       await delayPromise(100);
       tries--;
     } catch {
@@ -918,15 +940,15 @@ const waitForService = async (service) => {
   let tries = 100;
   do {
     try {
-      const podName = await getPodName(service, true);
+      const podName = await getPodName(service);
       await runCommand(
         `kubectl ${KUBECTL_CONTEXT} wait --for jsonpath={.status.containerStatuses[0].started}=true ${podName}`,
-        true
+        { verbose: false }
       );
       return;
     } catch {
       tries--;
-      await delayPromise(100);
+      await delayPromise(500);
     }
   } while (tries > 0);
 };
@@ -1070,6 +1092,8 @@ const addTranslations = (languageCode, translations = {}) => {
           generic: {}
         };
       }
+
+      throw err;
     });
   };
 
@@ -1109,13 +1133,13 @@ const getTestComposeFilePath = file => path.resolve(__dirname, `../${file}-test.
 
 const generateK3DValuesFile = async () => {
   const view = {
-    repo: buildVersions.getRepo(),
+    repo: `${K3D_REPO()}/${buildVersions.getRepo()}`,
     tag: buildVersions.getImageTag(),
     db_name: constants.DB_NAME,
     user: constants.USERNAME,
     password: constants.PASSWORD,
-    secret: '',
-    uuid: '',
+    secret: env.COUCHDB_SECRET,
+    uuid: env.COUCHDB_UUID,
     namespace: PROJECT_NAME,
     data_path: K3D_DATA_PATH,
   };
@@ -1179,39 +1203,34 @@ const startServices = async () => {
   }
 };
 
-const runCommand = (command, silent) => {
-  const [cmd, ...params] = command.split(' ');
+const runCommand = (command, { verbose = true, overrideEnv = false } = {}) => {
+  verbose && console.log(command);
   return new Promise((resolve, reject) => {
-    const proc = spawn(cmd, params, { env });
-    const output = [];
-    const log = (data, error) => {
-      data = data.toString();
-      output.push(data);
-      if (!silent) {
-        error ? console.error(data) : console.log(data);
+    exec(command, { env: overrideEnv || env }, (error, stdout, stderr) => {
+      if (error) {
+        verbose && console.error(error);
+        return reject(error);
       }
-    };
 
-    proc.on('error', (err) => {
-      console.error(err);
-      reject(err);
-    });
-    proc.stdout.on('data', log);
-    proc.stderr.on('data', log);
-
-    proc.on('close', (exitCode) => {
-      const outString = output.join('\n');
-      return exitCode ? reject(outString) : resolve(outString);
+      verbose && console.error(stderr);
+      verbose && console.log(stdout);
+      resolve(stdout);
     });
   });
 };
 
 const createCluster = async (dataDir) => {
   const hostPort = process.env.NGINX_HTTPS_PORT ? `${process.env.NGINX_HTTPS_PORT}` : '443';
+  await runCommand(`k3d registry create ${K3D_REGISTRY}`);
+
+  const port = await runCommand(`docker container port k3d-${K3D_REGISTRY}`);
+  K3D_REGISTRY_PORT = port.trim().replace('5000/tcp -> 0.0.0.0:', '');
+
   await runCommand(
     `k3d cluster create ${PROJECT_NAME} ` +
     `--port ${hostPort}:443@loadbalancer ` +
-    `--volume ${dataDir}:${K3D_DATA_PATH} --kubeconfig-switch-context=false`
+    `--volume ${dataDir}:${K3D_DATA_PATH} --kubeconfig-switch-context=false ` +
+    `--registry-use ${K3D_REPO()}`
   );
 };
 
@@ -1228,15 +1247,21 @@ const importImages = async () => {
     // authentication to private repos is weird to set up in k3d.
     // https://k3d.io/v5.2.0/usage/registries/#authenticated-registries
     try {
-      await runCommand(`docker image inspect ${image}`, true);
+      await runCommand(`docker image inspect ${image}`, { verbose: false });
     } catch {
       await runCommand(`docker pull ${image}`);
     }
-    await runCommand(`k3d image import ${image} -c ${PROJECT_NAME}`);
+    await runCommand(`docker tag ${image} ${K3D_REPO()}/${image}`);
+    await runCommand(`docker push ${K3D_REPO()}/${image}`);
   }
 };
 
 const cleanupOldCluster = async () => {
+  try {
+    await runCommand(`k3d registry delete ${K3D_REGISTRY}`);
+  } catch {
+    console.warn('No registry to clean up');
+  }
   try {
     await runCommand(`k3d cluster delete ${PROJECT_NAME}`);
   } catch {
@@ -1461,7 +1486,14 @@ const collectLogs = (container, ...regex) => {
     errors.push(err.toString());
   });
 
+  const timeout = setTimeout(() => {
+    receivedFirstLine();
+    errors.push('Timed out waiting for first log line');
+    killSpawnedProcess(proc);
+  }, 180000);
+
   const collect = () => {
+    clearTimeout(timeout);
     if (errors.length) {
       const error = new Error('CollectLogs errored');
       error.errors = errors;
@@ -1483,9 +1515,14 @@ const collectHaproxyLogs = (...regex) => collectLogs('haproxy', ...regex);
 
 const normalizeTestName = name => name.replace(/\s/g, '_');
 
-const apiLogTestStart = (name) => {
-  return requestOnTestDb(`/?start=${normalizeTestName(name)}`)
-    .catch(() => console.warn('Error logging test start - ignoring'));
+const apiLogTestStart = async (name) => {
+  try {
+    await requestOnTestDb(`/?start=${normalizeTestName(name)}`);
+  } catch (err) {
+    console.error('Api is not up. Cancelling workflow', err);
+    await saveLogs();
+    process.exit(1);
+  }
 };
 
 const apiLogTestEnd = (name) => {
@@ -1517,16 +1554,20 @@ const getUpdatedPermissions = async (roles, addPermissions, removePermissions) =
   return settings.permissions;
 };
 
-const updatePermissions = async (roles, addPermissions, removePermissions, ignoreReload) => {
+const updatePermissions = async (roles, addPermissions, removePermissions, options = {}) => {
   const permissions = await getUpdatedPermissions(roles, addPermissions, removePermissions);
-  await updateSettings({permissions}, { ignoreReload: ignoreReload });
+  const { ignoreReload = false, revert = false, refresh = false, sync = false } = options;
+  await updateSettings(
+    { permissions },
+    { ignoreReload, revert, refresh, sync }
+  );
 };
 
 const getSentinelDate = () => getContainerDate('sentinel');
-const getPodName = async (service, silent) => {
+const getPodName = async (service, verbose) => {
   const cmd = await runCommand(
     `kubectl get pods ${KUBECTL_CONTEXT} -l cht.service=${service} --field-selector=status.phase==Running -o name`,
-    silent
+    { verbose }
   );
   return cmd.replace(/[^A-Za-z0-9-/]/g, '');
 };
@@ -1562,6 +1603,9 @@ const isMinimumChromeVersion = process.env.CHROME_VERSION === MINIMUM_BROWSER_VE
 
 const escapeBranchName = (branch) => branch?.replace(/[/|_]/g, '-');
 
+const toggleSentinelTransitions = () => sendSignal('sentinel', 'USR1');
+const runSentinelTasks = () => sendSignal('sentinel', 'USR2');
+
 module.exports = {
   db,
   sentinelDb,
@@ -1640,4 +1684,7 @@ module.exports = {
   stopCouchDb,
   startCouchDb,
   getDefaultForms,
+  toggleSentinelTransitions,
+  runSentinelTasks,
+  runCommand,
 };
diff --git a/tests/utils/screenshots.js b/tests/utils/screenshots.js
index 0bfe1d6fcaa..20c15202703 100644
--- a/tests/utils/screenshots.js
+++ b/tests/utils/screenshots.js
@@ -13,10 +13,10 @@
 const sharp = require('sharp');
 
 const MOBILE_WINDOW_WIDTH = 768;
-const MOBILE_VIEWPORT_WIDTH = 320;
-const MOBILE_VIEWPORT_HEIGHT = 570;
-const DESKTOP_WINDOW_WIDTH = 1000;
-const DESKTOP_WINDOW_HEIGHT = 820;
+const MOBILE_VIEWPORT_WIDTH = 375;
+const MOBILE_VIEWPORT_HEIGHT = 645;
+const DESKTOP_WINDOW_WIDTH = 1440;
+const DESKTOP_WINDOW_HEIGHT = 1024;
 const HIGH_DENSITY_DISPLAY_2X = 2;
 
 const isMobile = async () => {
@@ -37,8 +37,8 @@ const resizeWindowForScreenshots = async () => {
       'AppleWebKit/537.36 (KHTML, like Gecko) ' +
       'Chrome/92.0.4515.159 Mobile Safari/537.36'
     });
-  } 
-  
+  }
+
   return await browser.setWindowSize(DESKTOP_WINDOW_WIDTH, DESKTOP_WINDOW_HEIGHT);
 };
 
@@ -72,4 +72,5 @@ const generateScreenshot = async (scenario, step) => {
 module.exports = {
   resizeWindowForScreenshots,
   generateScreenshot,
+  isMobile,
 };
diff --git a/tests/utils/sentinel.js b/tests/utils/sentinel.js
index 91162a8f672..11b40ac2a13 100644
--- a/tests/utils/sentinel.js
+++ b/tests/utils/sentinel.js
@@ -19,7 +19,7 @@ const waitForSeq = (metadataId, docIds) => {
   return utils.sentinelDb
     .get(metadataId)
     .catch(err => {
-      if (err.statusCode === 404) { // maybe Sentinel hasn't started yet
+      if (err.status === 404) { // maybe Sentinel hasn't started yet
         return { value: 0 };
       }
       throw err;
@@ -93,6 +93,7 @@ const getPurgeDbs = () => {
 
 const waitForPurgeCompletion = async (seq) => {
   const waitForWipe = await utils.waitForApiLogs(/Wiping purged docs cache/);
+  await utils.runSentinelTasks();
   await waitForPurgeLog(seq);
   await waitForWipe.promise;
 };
diff --git a/tests/utils/sms.js b/tests/utils/sms.js
index c2e5f5486a7..3ee179d1875 100644
--- a/tests/utils/sms.js
+++ b/tests/utils/sms.js
@@ -5,7 +5,7 @@ const sendSms = async (phone, message = 'testing sms') => {
     method: 'POST',
     path: '/api/v2/records',
     headers: {
-      'Content-type': 'application/x-www-form-urlencoded'
+      'Content-Type': 'application/x-www-form-urlencoded'
     },
     body: `message=${message}&from=${phone}`,
   });  
diff --git a/tests/wdio.conf.js b/tests/wdio.conf.js
index 58cb0b71c26..fa47134c6fe 100644
--- a/tests/wdio.conf.js
+++ b/tests/wdio.conf.js
@@ -1,6 +1,5 @@
 require('./aliases');
 const path = require('path');
-const allure = require('allure-commandline');
 const fs = require('fs');
 
 const chai = require('chai');
@@ -10,6 +9,7 @@ const constants = require('@constants');
 const utils = require('@utils');
 const fileDownloadUtils = require('@utils/file-download');
 const browserLogsUtils = require('@utils/browser-logs');
+const { generateReport } = require('@utils/allure');
 const ALLURE_OUTPUT = 'allure-results';
 const browserLogPath = path.join('tests', 'logs', 'browser.console.log');
 const logLevels = ['error', 'warning', 'debug'];
@@ -361,27 +361,7 @@ const baseConfig = {
   onComplete: async () => {
     fileDownloadUtils.deleteDownloadDirectory();
     await utils.tearDownServices();
-    const reportError = new Error('Could not generate Allure report');
-    const timeoutError = new Error('Timeout generating report');
-    const generation = allure(['generate', 'allure-results', '--clean']);
-
-    return new Promise((resolve, reject) => {
-      const generationTimeout = setTimeout(
-        () => reject(timeoutError),
-        60 * 1000
-      );
-
-      generation.on('exit', (exitCode) => {
-        clearTimeout(generationTimeout);
-
-        if (exitCode !== 0) {
-          return reject(reportError);
-        }
-
-        console.log('Allure report successfully generated');
-        resolve();
-      });
-    });
+    await generateReport();
   },
   /**
   * Gets executed when a refresh happens.
diff --git a/webapp/src/css/content-list.less b/webapp/src/css/content-list.less
index 9df79d09088..9401940fdcf 100644
--- a/webapp/src/css/content-list.less
+++ b/webapp/src/css/content-list.less
@@ -217,6 +217,21 @@
   }
 }
 
+.trainings .content-row {
+  &.selected, &.selected-to-view {
+    background-color: @training-highlight;
+  }
+
+  &:hover {
+    border-left-color: @training-color;
+  }
+
+  &.completed .mat-icon-check {
+    padding-top: 6px;
+    color: @completed-state-color;
+  }
+}
+
 .contacts .content-row {
   &.selected {
     background-color: @contacts-highlight;
diff --git a/webapp/src/css/inbox.less b/webapp/src/css/inbox.less
index 71a71b4af99..6580dbcfa1f 100644
--- a/webapp/src/css/inbox.less
+++ b/webapp/src/css/inbox.less
@@ -53,18 +53,20 @@ body {
     }
 
     &.about,
+    &.trainings,
     &.testing,
     &.user,
     &.privacy-policy {
       .tool-bar {
         background-color: @top-header-color;
 
-        .ellipsis-title {
+        .ellipsis-title,
+        .app-menu-button .mat-icon[fonticon="fa-bars"]:before {
           color: @text-inverse-color;
         }
 
-        .app-menu-button .mat-icon[fonticon="fa-bars"]:before {
-          color: @text-inverse-color;
+        .navigation .mat-icon-back path {
+          fill: @text-inverse-color;
         }
       }
 
@@ -479,7 +481,10 @@ mm-analytics-filters {
   background-color: @background-color;
 }
 
-.reports .inbox-items, .contacts .inbox-items, .messages .inbox-items {
+.reports .inbox-items,
+.contacts .inbox-items,
+.messages .inbox-items,
+.trainings .inbox-items {
   overflow-y: hidden;
   overflow-x: hidden;
   height: 100%;
@@ -580,10 +585,13 @@ mm-analytics-filters {
     font-size: 12px;
     vertical-align: middle;
   }
-  .card .resource-icon img {
-    width: @icon-small;
-    height: @icon-small;
+  .card .resource-icon {
+    svg, img {
+      width: @icon-small;
+      height: @icon-small;
+    }
   }
+
   .card.children .row a:hover {
     border-color: @contacts-color;
   }
@@ -846,6 +854,7 @@ a.fa:hover {
 
 .reports,
 .messages,
+.trainings,
 .tasks {
   .item-content {
     .body {
@@ -1376,6 +1385,11 @@ mm-sidebar-menu .mat-sidenav-container {
       margin-left: 10px;
       flex-shrink: 0;
     }
+
+    mat-icon.fa-graduation-cap:before {
+      font-size: @font-medium;
+      vertical-align: middle;
+    }
   }
 
   .nav-item:not(:not(.hidden) ~ .nav-item) { // The first element without .hidden class, compatible with Chrome +90
@@ -1432,6 +1446,7 @@ mm-sidebar-menu .mat-sidenav-container {
     &.messages,
     &.tasks,
     &.reports,
+    &.trainings,
     &.contacts {
       .loading-status {
         margin: 10px 10px calc(@tab-navbar-size + 10px);
@@ -1667,6 +1682,7 @@ mm-sidebar-menu .mat-sidenav-container {
     }
   }
   .reports,
+  .trainings,
   .tasks {
     .content .item-content .body > div > ul > li {
       padding: 10px;
@@ -1905,4 +1921,4 @@ mm-sidebar-menu .mat-sidenav-container {
   .desktop-only {
     display: none;
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/css/modal.less b/webapp/src/css/modal.less
index 5e2dc806890..80e70b07d6f 100644
--- a/webapp/src/css/modal.less
+++ b/webapp/src/css/modal.less
@@ -36,6 +36,7 @@ mm-modal-layout {
 
     .modal-footer {
       padding: 24px 0;
+      margin-bottom: 0;
     }
   }
 
@@ -55,7 +56,8 @@ mm-modal-layout {
     text-align: left;
   }
 
-  .enketo-modal {
+  .enketo-modal,
+  .modal-body training-cards-confirm {
     &.content-pane {
       position: relative;
     }
@@ -63,15 +65,13 @@ mm-modal-layout {
     .item-content {
       padding: 0;
       background: none;
+      & > .body {
+        margin: 0;
+      }
     }
 
     .modal-body {
       overflow: hidden;
-      margin-bottom: 11px;
-    }
-
-    .modal-footer {
-      padding: 0;
     }
 
     .enketo {
@@ -100,18 +100,31 @@ mm-modal-layout {
         }
       }
 
-      form {
-        max-height: 65vh;
+      form.pages [role=page].current {
+        margin: 0;
+        display: block;
+        max-height: @training-cards-page-height;
         overflow-y: auto;
+        padding-bottom: @training-cards-footer-height;
       }
     }
 
-    .form-no-title #form-title {
-      display: none;
+    #form-title {
+      font-size: @font-XXL;
+      font-weight: normal;
+      letter-spacing: normal;
+      border: none;
+      background: @form-background-color;
+      width: 100%;
     }
 
     .form-footer {
-      padding: 24px 0;
+      position: absolute;
+      bottom: 0;
+      margin: 0;
+      background: @form-background-color;
+      padding: 20px 0;
+      z-index: 20;
       .btn,
       .btn:active,
       .btn:focus {
@@ -121,16 +134,24 @@ mm-modal-layout {
       }
     }
   }
+
+  &:not(.has-error) .enketo-modal .modal-footer {
+    padding: 0;
+  }
+
+  &.has-error .enketo-modal .modal-body {
+    padding-top: 40px;
+  }
+
+  .enketo-modal training-cards-confirm .modal-footer {
+    margin-bottom: 20px;
+  }
 }
 
 @media (max-width: @media-mobile) {
   mm-modal-layout {
     .enketo-modal {
       .enketo {
-        form {
-          max-height: 60vh;
-        }
-
         .form-footer {
           .btn.btn-link.cancel {
             display: inline-block;
@@ -142,13 +163,9 @@ mm-modal-layout {
         }
       }
 
-      // The form title is hidden by default for mobile devices, but in training cards, the title is optional.
-      :not(.form-no-title) #form-title {
-        display: inherit;
-      }
-
-      .form-no-title  #form-title {
-        display: none;
+      // The form's title is hidden by default for mobile devices; but in training cards, the title is displayed.
+      #form-title {
+        display: inline-block;
       }
     }
   }
diff --git a/webapp/src/css/old-nav.less b/webapp/src/css/old-nav.less
index c2d2dae7864..87c928d0f30 100644
--- a/webapp/src/css/old-nav.less
+++ b/webapp/src/css/old-nav.less
@@ -8,6 +8,18 @@
     padding-top: 0;
   }
 
+  &.trainings {
+    .content .inner .page {
+      padding-top: 0;
+      padding-left: 0;
+      top: @top-without-filter;
+    }
+
+    .tool-bar .inner {
+      background-color: @top-header-color;
+    }
+  }
+
   .app-menu-button {
     display: none;
   }
@@ -435,6 +447,10 @@
     .targets .target:last-child {
       margin-bottom: 10px;
     }
+
+    &.trainings.show-content .content .inner .page {
+      top: @toolbar-mobile-height;
+    }
   }
 
   #target-aggregates-list {
diff --git a/webapp/src/css/variables.less b/webapp/src/css/variables.less
index 3be3de65763..7453356dc76 100644
--- a/webapp/src/css/variables.less
+++ b/webapp/src/css/variables.less
@@ -68,6 +68,8 @@
 @contacts-highlight: @pink-highlight;
 @reports-color: @yellow;
 @reports-highlight: @yellow-highlight;
+@training-color: @gray-medium;
+@training-highlight: @gray-ultra-lighter;
 @analytics-color: @teal;
 @analytics-highlight: @teal-highlight;
 @admin-color: @gray-dark;
@@ -78,6 +80,7 @@
 @pending-state-color: @yellow;
 @success-state-color: @teal-dark;
 @sent-state-color: @teal-dark;
+@completed-state-color: @teal-dark;
 @muted-state-color: @gray-medium;
 @failed-state-color: @red;
 @cleared-state-color: @gray-medium;
@@ -122,6 +125,8 @@
 @tab-navbar-size: 80px;
 @more-options-icon-size-mobile: 32px;
 @more-options-icon-size-desktop: 24px;
+@training-cards-footer-height: 95px;
+@training-cards-page-height: 54vh;
 
 /* fonts */
 @font-family-main: Noto, sans-serif;
diff --git a/webapp/src/img/icon-check.svg b/webapp/src/img/icon-check.svg
new file mode 100644
index 00000000000..cd4d2dece43
--- /dev/null
+++ b/webapp/src/img/icon-check.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g>
+  <path d="M23,7.14l-8.57,8.57-1.21,1.21a1.69,1.69,0,0,1-2.42,0L5.64,11.78A1.71,1.71,0,0,1,8.07,9.36L12,13.29l9.1-9.1A11.91,11.91,0,1,0,23.33,8,8.39,8.39,0,0,0,23,7.14Z" fill-rule="evenodd"/>
+</g></svg>
diff --git a/webapp/src/js/bootstrapper/translator.js b/webapp/src/js/bootstrapper/translator.js
index b9d52d5a170..d658d054344 100644
--- a/webapp/src/js/bootstrapper/translator.js
+++ b/webapp/src/js/bootstrapper/translator.js
@@ -130,6 +130,24 @@ const TRANSLATIONS = {
     SESSION_EXPIRED_DESCRIPTION: 'Sesi Anda telah berakhir dan Anda telah keluar. Silakan masuk kembali untuk melanjutkan.',
     LOGIN: 'Login',
   },
+  ar: {
+    FETCH_INFO: ({ count, total }) => `جارٍ جلب المعلومات (${count} من مستندات ${total})...`,
+    LOAD_APP: 'جارٍ تحميل التطبيق…',
+    PURGE_INIT: 'جارٍ التحقق من البيانات…',
+    PURGE_INFO: ({ count }) => `تم تنظيف ${count} من المستندات...`,
+    PURGE_META: 'جارٍ تنظيف البيانات التعريفية…',
+    STARTING_APP: 'جارٍ بدء التطبيق…',
+    DOWNLOAD_APP: 'جارٍ تنزيل التطبيق…',
+    ERROR_MESSAGE: 'حدث خطأ أثناء التحميل، يرجى التحقق من اتصالك.',
+    TRY_AGAIN: 'حاول ثانية',
+    POLL_REPLICATION: 'استقصاء بيانات النسخ المتماثل...',
+    TOO_MANY_DOCS: ({ count, limit }) => `تحذير! أنت على وشك تنزيل مستندات ${count}، وهو ما يتجاوز الحد الموصى به وهو ${limit}. هل ترغب في الاستمرار؟`,
+    CONTINUE: 'متابعة',
+    ABORT: 'إلغاء',
+    SESSION_EXPIRED_TITLE: 'انتهت صلاحية الجلسة',
+    SESSION_EXPIRED_DESCRIPTION: 'لقد انتهت جلستك وتم تسجيل خروجك. الرجاء تسجيل الدخول للمتابعة.',
+    LOGIN: 'تسجيل الدخول',
+  },
 };
 /* eslint-enable max-len */
 
diff --git a/webapp/src/js/enketo/main.js b/webapp/src/js/enketo/main.js
index fa92b6ee01a..41843ed3a48 100644
--- a/webapp/src/js/enketo/main.js
+++ b/webapp/src/js/enketo/main.js
@@ -6,6 +6,7 @@ require('bootstrap-datepicker/js/locales/bootstrap-datepicker.sw');
 require('bootstrap-datepicker/js/locales/bootstrap-datepicker.id');
 require('bootstrap-datepicker/js/locales/bootstrap-datepicker.bm');
 require('bootstrap-datepicker/js/locales/bootstrap-datepicker.hi');
+require('bootstrap-datepicker/js/locales/bootstrap-datepicker.ar');
 require('./bootstrap-datepicker.ceb');
 require('./bootstrap-datepicker.hil');
 require('./bootstrap-datepicker.tl');
diff --git a/webapp/src/ts/actions/global.ts b/webapp/src/ts/actions/global.ts
index c058d2e395f..0e1472723e5 100644
--- a/webapp/src/ts/actions/global.ts
+++ b/webapp/src/ts/actions/global.ts
@@ -11,6 +11,7 @@ export const Actions = {
   setLoadingContent: createSingleValueAction('SET_LOADING_CONTENT', 'loadingContent'),
   setShowContent: createSingleValueAction('SET_SHOW_CONTENT', 'showContent'),
   setForms: createSingleValueAction('SET_FORMS', 'forms'),
+  setTrainingMaterials: createSingleValueAction('SET_TRAINING_MATERIALS', 'trainingMaterials'),
   clearFilters: createSingleValueAction('CLEAR_FILTERS', 'skip'),
   setFilter: createSingleValueAction('SET_FILTER', 'filter'),
   setSidebarFilter: createSingleValueAction('SET_SIDEBAR_FILTER', 'sidebarFilter'),
@@ -38,6 +39,7 @@ export const Actions = {
   openSidebarMenu: createAction('OPEN_SIDEBAR_MENU'),
   setSearchBar: createSingleValueAction('SET_SEARCH_BAR', 'searchBar'),
   setTrainingCard: createSingleValueAction('SET_TRAINING_CARD', 'trainingCard'),
+  clearTrainingCards: createAction('CLEAR_TRAINING_CARDS'),
 };
 
 export class GlobalActions {
@@ -71,6 +73,10 @@ export class GlobalActions {
     return this.store.dispatch(Actions.setForms(forms));
   }
 
+  setTrainingMaterials(trainingMaterials) {
+    return this.store.dispatch(Actions.setTrainingMaterials(trainingMaterials));
+  }
+
   setShowContent(showContent) {
     return this.store.dispatch(Actions.setShowContent(showContent));
   }
@@ -100,6 +106,15 @@ export class GlobalActions {
     return this.store.dispatch(Actions.setTrainingCard(trainingCard));
   }
 
+  clearTrainingCards() {
+    this.setTrainingCard({
+      formId: null,
+      isOpen: false,
+      showConfirmExit: false,
+      nextUrl: null,
+    });
+  }
+
   clearSidebarFilter() {
     return this.store.dispatch(Actions.clearSidebarFilter());
   }
diff --git a/webapp/src/ts/app-routing.module.ts b/webapp/src/ts/app-routing.module.ts
index 3ecbaafc0cd..9ba91864672 100644
--- a/webapp/src/ts/app-routing.module.ts
+++ b/webapp/src/ts/app-routing.module.ts
@@ -11,6 +11,7 @@ import { routes as messagesRoutes } from '@mm-modules/messages/messages.routes';
 import { routes as contactsRoutes } from '@mm-modules/contacts/contacts.routes';
 import { routes as privacyPolicyRoutes } from '@mm-modules/privacy-policy/privacy-policy.routes';
 import { routes as tasksRoutes } from '@mm-modules/tasks/tasks.routes';
+import { routes as trainingRoutes } from '@mm-modules/trainings/trainings.routes';
 import { routes as testingRoutes } from '@mm-modules/testing/testing.routes';
 
 const routes: Routes = [
@@ -23,6 +24,7 @@ const routes: Routes = [
   ...contactsRoutes,
   ...privacyPolicyRoutes,
   ...tasksRoutes,
+  ...trainingRoutes,
   ...testingRoutes,
   ...errorRoutes,
 ];
diff --git a/webapp/src/ts/app.component.ts b/webapp/src/ts/app.component.ts
index 6ee6738633a..a0079893d52 100644
--- a/webapp/src/ts/app.component.ts
+++ b/webapp/src/ts/app.component.ts
@@ -83,7 +83,6 @@ export class AppComponent implements OnInit, AfterViewInit {
   private analyticsActions: AnalyticsActions;
   setupPromise;
   translationsLoaded;
-
   currentTab = '';
   privacyPolicyAccepted;
   isSidebarFilterOpen = false;
@@ -94,14 +93,13 @@ export class AppComponent implements OnInit, AfterViewInit {
   canLogOut;
   replicationStatus;
   androidAppVersion;
-  unreadCount = {};
   hasOldNav = false;
   initialisationComplete = false;
-  trainingCardFormId = '';
   private readonly SVG_ICONS = new Map([
     ['icon-close', './img/icon-close.svg'],
     ['icon-filter', './img/icon-filter.svg'],
     ['icon-back', './img/icon-back.svg'],
+    ['icon-check', './img/icon-check.svg'],
   ]);
 
   constructor (
@@ -482,16 +480,9 @@ export class AppComponent implements OnInit, AfterViewInit {
     combineLatest([
       this.store.select(Selectors.getPrivacyPolicyAccepted),
       this.store.select(Selectors.getShowPrivacyPolicy),
-      this.store.select(Selectors.getTrainingCardFormId),
-    ]).subscribe(([
-      privacyPolicyAccepted,
-      showPrivacyPolicy,
-      trainingCardFormId,
-    ]) => {
+    ]).subscribe(([ privacyPolicyAccepted, showPrivacyPolicy ]) => {
       this.showPrivacyPolicy = showPrivacyPolicy;
       this.privacyPolicyAccepted = privacyPolicyAccepted;
-      this.trainingCardFormId = trainingCardFormId || '';
-      this.displayTrainingCards();
     });
 
     combineLatest([
@@ -502,14 +493,6 @@ export class AppComponent implements OnInit, AfterViewInit {
     });
   }
 
-  private displayTrainingCards() {
-    if (!this.trainingCardFormId || (this.showPrivacyPolicy && !this.privacyPolicyAccepted)) {
-      return;
-    }
-
-    this.trainingCardsService.displayTrainingCards();
-  }
-
   private async subscribeToSideFilterStore() {
     this.store
       .select(Selectors.getSidebarFilter)
diff --git a/webapp/src/ts/components/components.module.ts b/webapp/src/ts/components/components.module.ts
index f983ff0dd06..0c930b97e08 100644
--- a/webapp/src/ts/components/components.module.ts
+++ b/webapp/src/ts/components/components.module.ts
@@ -46,6 +46,7 @@ import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.c
 import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';
 import { SidebarMenuComponent } from '@mm-components/sidebar-menu/sidebar-menu.component';
 import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
+import { TrainingCardsFormComponent } from '@mm-components/training-cards-form/training-cards-form.component';
 
 @NgModule({
   declarations: [
@@ -75,6 +76,7 @@ import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
     ModalLayoutComponent,
     PanelHeaderComponent,
     SidebarMenuComponent,
+    TrainingCardsFormComponent,
     ToolBarComponent,
   ],
   imports: [
@@ -118,6 +120,7 @@ import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
     ModalLayoutComponent,
     PanelHeaderComponent,
     SidebarMenuComponent,
+    TrainingCardsFormComponent,
     ToolBarComponent,
   ]
 })
diff --git a/webapp/src/ts/components/header/header.component.html b/webapp/src/ts/components/header/header.component.html
index be5bd14f2f2..cd347ff4880 100644
--- a/webapp/src/ts/components/header/header.component.html
+++ b/webapp/src/ts/components/header/header.component.html
@@ -75,6 +75,12 @@
 
           <li role="separator" class="divider" *ngIf="!replicationStatus.disabled"></li>
 
+          <li role="presentation">
+            <a routerLink="trainings" role="menuitem" tabindex="-1">
+              <i class="fa fa-fw fa-graduation-cap"></i>
+              <span>{{'training_materials.page.title' | translate}}</span>
+            </a>
+          </li>
           <li role="presentation">
             <a routerLink="about" role="menuitem" tabindex="-1">
               <i class="fa fa-fw fa-question"></i>
diff --git a/webapp/src/ts/components/modal-layout/modal-layout.component.html b/webapp/src/ts/components/modal-layout/modal-layout.component.html
index 105d9cc16bb..40e97d26b33 100644
--- a/webapp/src/ts/components/modal-layout/modal-layout.component.html
+++ b/webapp/src/ts/components/modal-layout/modal-layout.component.html
@@ -1,5 +1,5 @@
 <div class="modal-layout" role="document" [class.enketo-modal]="hasEnketoForm" [class.content-pane]="hasEnketoForm">
-  <mm-panel-header [headerTitle]="titleKey" (onClose)="cancel()" [hideCloseButton]="true"></mm-panel-header>
+  <mm-panel-header *ngIf="titleKey" [headerTitle]="titleKey" (onClose)="cancel()" [hideCloseButton]="true"/>
 
   <div class="modal-body"><ng-content></ng-content></div>
 
diff --git a/webapp/src/ts/components/sidebar-menu/sidebar-menu.component.ts b/webapp/src/ts/components/sidebar-menu/sidebar-menu.component.ts
index 3cee129ba70..bf2ddbe6b8e 100644
--- a/webapp/src/ts/components/sidebar-menu/sidebar-menu.component.ts
+++ b/webapp/src/ts/components/sidebar-menu/sidebar-menu.component.ts
@@ -129,6 +129,12 @@ export class SidebarMenuComponent implements OnInit, OnDestroy {
 
   private setSecondaryOptions(showPrivacyPolicy = false) {
     this.secondaryOptions = [
+      {
+        routerLink: 'trainings',
+        icon: 'fa-graduation-cap',
+        translationKey: 'training_materials.page.title',
+        canDisplay: true,
+      },
       {
         routerLink: 'about',
         icon: 'fa-question',
diff --git a/webapp/src/ts/components/training-cards-form/training-cards-form.component.html b/webapp/src/ts/components/training-cards-form/training-cards-form.component.html
new file mode 100644
index 00000000000..2ef7a86c6d3
--- /dev/null
+++ b/webapp/src/ts/components/training-cards-form/training-cards-form.component.html
@@ -0,0 +1,15 @@
+<div class="item-content empty-selection" [class.col-sm-8]="isEmbedded" *ngIf="contentError || loadingContent">
+  <div *ngIf="loadingContent"><div class="loader"></div></div>
+  <div *ngIf="!loadingContent && contentError">{{ errorTranslationKey | translate }}</div>
+</div>
+
+<div class="item-content" [hidden]="loadingContent || contentError || !trainingCardFormId" [class.col-sm-8]="isEmbedded">
+  <div class="body">
+    <mm-enketo
+      [formId]="FORM_WRAPPER_ID"
+      [status]="enketoStatus"
+      (onSubmit)="saveForm()"
+      (onCancel)="quit.emit()">
+    </mm-enketo>
+  </div>
+</div>
diff --git a/webapp/src/ts/components/training-cards-form/training-cards-form.component.ts b/webapp/src/ts/components/training-cards-form/training-cards-form.component.ts
new file mode 100644
index 00000000000..d2c40715cd8
--- /dev/null
+++ b/webapp/src/ts/components/training-cards-form/training-cards-form.component.ts
@@ -0,0 +1,230 @@
+import { Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Subscription } from 'rxjs';
+
+import { XmlFormsService } from '@mm-services/xml-forms.service';
+import { FormService } from '@mm-services/form.service';
+import { Selectors } from '@mm-selectors/index';
+import { GlobalActions } from '@mm-actions/global';
+import { GeolocationService } from '@mm-services/geolocation.service';
+import { TranslateService } from '@mm-services/translate.service';
+import { PerformanceService } from '@mm-services/performance.service';
+import { EnketoFormContext } from '@mm-services/enketo.service';
+import { TranslateFromService } from '@mm-services/translate-from.service';
+
+@Component({
+  selector: 'training-cards-form',
+  templateUrl: './training-cards-form.component.html',
+})
+export class TrainingCardsFormComponent implements OnInit, OnDestroy {
+  @Input() isEmbedded = true;
+  @Output() quit = new EventEmitter<boolean>();
+  @Output() save = new EventEmitter<void>();
+  @Output() handleError = new EventEmitter<void>();
+  private geoHandle:any;
+  private readonly globalActions: GlobalActions;
+  private trackRender;
+  private trackEditDuration;
+  private trackSave;
+  private trackMetadata = { action: '', form: '' };
+  readonly FORM_WRAPPER_ID = 'training-cards-form';
+  trainingCardFormId: null | string = null;
+  formNoTitle = false;
+  form;
+  loadingContent = true;
+  contentError;
+  errorTranslationKey;
+  enketoError;
+  enketoStatus;
+  enketoSaving;
+  subscriptions: Subscription = new Subscription();
+
+  constructor(
+    private readonly ngZone: NgZone,
+    private readonly store: Store,
+    private readonly xmlFormsService: XmlFormsService,
+    private readonly formService: FormService,
+    private readonly geolocationService: GeolocationService,
+    private readonly translateService: TranslateService,
+    private readonly performanceService: PerformanceService,
+    private readonly translateFromService: TranslateFromService,
+  ) {
+    this.globalActions = new GlobalActions(this.store);
+  }
+
+  ngOnInit() {
+    this.trackRender = this.performanceService.track();
+    this.reset();
+    this.subscribeToStore();
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+    this.geoHandle?.cancel();
+    // old code checked whether the component is reused before unloading the form
+    // this is because AngularJS created the new "controller" before destroying the old one
+    // in Angular, unless specific RouteReuseStrategies are employed, components are always
+    // destroyed before new ones are created
+    // see https://github.com/angular/angular/blob/10.2.x/packages/router/src/operators/activate_routes.ts#L37
+    // for Angular behavior
+    // see https://github.com/medic/cht-core/issues/2198#issuecomment-210202785 for AngularJS behavior
+    this.formService.unload(this.form);
+    this.globalActions.clearEnketoStatus();
+  }
+
+  private subscribeToStore() {
+    const reduxSubscription = combineLatest([
+      this.store.select(Selectors.getEnketoStatus),
+      this.store.select(Selectors.getEnketoSavingStatus),
+      this.store.select(Selectors.getEnketoError),
+      this.store.select(Selectors.getTrainingCardFormId),
+    ]).subscribe(([
+      enketoStatus,
+      enketoSaving,
+      enketoError,
+      trainingCardFormId,
+    ]) => {
+      this.enketoStatus = enketoStatus;
+      this.enketoSaving = enketoSaving;
+      this.enketoError = enketoError;
+
+      if (trainingCardFormId && trainingCardFormId !== this.trainingCardFormId) {
+        this.trainingCardFormId = trainingCardFormId;
+        this.loadForm();
+      }
+    });
+    this.subscriptions.add(reduxSubscription);
+  }
+
+  private loadForm() {
+    this.ngZone.runOutsideAngular(() => this._loadForm());
+  }
+
+  private async _loadForm() {
+    try {
+      this.loadingContent = true;
+      this.geoHandle?.cancel();
+      this.geoHandle = this.geolocationService.init();
+      const form = await this.xmlFormsService.get(this.trainingCardFormId);
+      await this.ngZone.run(() => this.renderForm(form));
+    } catch (error) {
+      this.setError(error);
+      console.error('TrainingCardsFormComponent :: Error fetching form.', error);
+    }
+  }
+
+  private async renderForm(formDoc) {
+    try {
+      const formContext = new EnketoFormContext(`#${this.FORM_WRAPPER_ID}`, 'training-card', formDoc);
+      formContext.isFormInModal = !this.isEmbedded;
+      formContext.valuechangeListener = this.resetFormError.bind(this);
+
+      this.form = await this.formService.render(formContext);
+      this.formNoTitle = !formDoc?.title;
+      this.setNavigationTitle(formDoc);
+      this.showContent();
+      this.recordPerformancePostRender();
+    } catch (error) {
+      this.setError(error);
+      console.error('TrainingCardsFormComponent :: Error rendering form.', error);
+    }
+  }
+
+  private showContent() {
+    this.loadingContent = false;
+    if (!this.isEmbedded) {
+      return;
+    }
+    this.globalActions.setShowContent(true);
+  }
+
+  private setNavigationTitle(formDoc) {
+    if (!this.isEmbedded) {
+      return;
+    }
+
+    if (formDoc?.translation_key) {
+      this.globalActions.setTitle(this.translateService.instant(formDoc.translation_key));
+      return;
+    }
+
+    if (formDoc?.title) {
+      this.globalActions.setTitle(this.translateFromService.get(formDoc?.title));
+      return;
+    }
+
+    this.globalActions.setTitle(formDoc?.internalId);
+  }
+
+  private reset() {
+    this.resetFormError();
+    this.contentError = false;
+    this.trainingCardFormId = null;
+    this.form = null;
+    this.loadingContent = true;
+  }
+
+  private resetFormError() {
+    if (this.enketoError) {
+      this.globalActions.setEnketoError(null);
+    }
+  }
+
+  setError(error) {
+    this.errorTranslationKey = error?.translationKey || 'training_cards.error.loading';
+    this.contentError = true;
+    this.handleError.emit();
+    this.showContent();
+  }
+
+  async saveForm() {
+    if (this.enketoSaving) {
+      console.debug('Attempted to call TrainingCardsFormComponent:saveForm more than once');
+      return;
+    }
+
+    this.recordPerformancePreSave();
+    this.globalActions.setEnketoSavingStatus(true);
+    this.resetFormError();
+
+    try {
+      const docs = await this.formService.save(this.trainingCardFormId, this.form, this.geoHandle);
+      console.debug('Saved form and associated docs', docs);
+      const snackText = await this.translateService.get('training_cards.form.saved');
+      this.globalActions.setSnackbarContent(snackText);
+      this.globalActions.setEnketoSavingStatus(false);
+      this.formService.unload(this.form);
+      this.globalActions.unsetSelected();
+      this.recordPerformancePostSave();
+      this.save.emit();
+    } catch (error) {
+      this.globalActions.setEnketoSavingStatus(false);
+      console.error('TrainingCardsFormComponent :: Error submitting form data.', error);
+      const friendlyMessage = await this.translateService.get('training_cards.error.save');
+      this.globalActions.setEnketoError(friendlyMessage);
+    }
+  }
+
+  private recordPerformancePostRender() {
+    this.trackMetadata.action = 'add';
+    this.trackMetadata.form = this.trainingCardFormId!;
+    this.trackRender?.stop({
+      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'render' ].join(':'),
+      recordApdex: true,
+    });
+    this.trackEditDuration = this.performanceService.track();
+  }
+
+  private recordPerformancePreSave() {
+    this.trackEditDuration?.stop({
+      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'user_edit_time' ].join(':'),
+    });
+    this.trackSave = this.performanceService.track();
+  }
+
+  private recordPerformancePostSave() {
+    this.trackSave?.stop({
+      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'save' ].join(':'),
+    });
+  }
+}
diff --git a/webapp/src/ts/main.ts b/webapp/src/ts/main.ts
index d4b492a22c9..191f50efb7b 100644
--- a/webapp/src/ts/main.ts
+++ b/webapp/src/ts/main.ts
@@ -32,6 +32,7 @@ require('moment/locale/hi');
 require('moment/locale/id');
 require('moment/locale/ne');
 require('moment/locale/sw');
+require('moment/locale/ar');
 
 require('select2');
 require('../js/enketo/main');
diff --git a/webapp/src/ts/modals/modals.module.ts b/webapp/src/ts/modals/modals.module.ts
index 9612024cd8b..43f1ed2b68c 100644
--- a/webapp/src/ts/modals/modals.module.ts
+++ b/webapp/src/ts/modals/modals.module.ts
@@ -23,6 +23,7 @@ import { EditMessageGroupComponent } from '@mm-modals/edit-message-group/edit-me
 import { SessionExpiredComponent } from '@mm-modals/session-expired/session-expired.component';
 import { DatabaseClosedComponent } from '@mm-modals/database-closed/database-closed.component';
 import { ContactsMutedComponent } from '@mm-modals/contacts-muted/contacts-muted.component';
+import { TrainingCardsConfirmComponent } from '@mm-modals/training-cards-confirm/training-cards-confirm.component';
 import { BrowserCompatibilityComponent } from '@mm-modals/browser-compatibility/browser-compatibility.component';
 
 
@@ -45,6 +46,7 @@ import { BrowserCompatibilityComponent } from '@mm-modals/browser-compatibility/
     SessionExpiredComponent,
     DatabaseClosedComponent,
     ContactsMutedComponent,
+    TrainingCardsConfirmComponent,
     BrowserCompatibilityComponent,
   ],
   imports: [
@@ -69,6 +71,7 @@ import { BrowserCompatibilityComponent } from '@mm-modals/browser-compatibility/
     CheckDateComponent,
     EditMessageGroupComponent,
     SessionExpiredComponent,
+    TrainingCardsConfirmComponent,
     BrowserCompatibilityComponent,
   ]
 })
diff --git a/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.html b/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.html
new file mode 100644
index 00000000000..f9ba1f54796
--- /dev/null
+++ b/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.html
@@ -0,0 +1,12 @@
+<div class="item-content">
+
+  <div>{{ 'training_cards.confirm.exit' | translate }}</div>
+
+  <div class="modal-footer">
+    <button test-id="cancel" mat-button color="primary" (click)="stay.emit()">
+      {{ 'training_cards.confirm.button.no' | translate }}
+    </button>
+    <button test-id="quit-training" mat-button color="primary" (click)="exit.emit(nextUrl)">{{ 'training_cards.confirm.button.yes' | translate }}</button>
+  </div>
+
+</div>
diff --git a/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.ts b/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.ts
new file mode 100644
index 00000000000..8e54bda3a58
--- /dev/null
+++ b/webapp/src/ts/modals/training-cards-confirm/training-cards-confirm.component.ts
@@ -0,0 +1,33 @@
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+
+import { Selectors } from '@mm-selectors/index';
+
+@Component({
+  selector: 'training-cards-confirm',
+  templateUrl: './training-cards-confirm.component.html'
+})
+export class TrainingCardsConfirmComponent implements OnInit, OnDestroy {
+  @Output() exit = new EventEmitter();
+  @Output() stay = new EventEmitter();
+  nextUrl: null | string = null;
+  subscriptions: Subscription = new Subscription();
+
+  constructor(private readonly store: Store) {}
+
+  ngOnInit() {
+    this.subscribeToStore();
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+  }
+
+  private subscribeToStore() {
+    const reduxSubscription = this.store
+      .select(Selectors.getTrainingCard)
+      .subscribe(trainingCard => this.nextUrl = trainingCard.nextUrl);
+    this.subscriptions.add(reduxSubscription);
+  }
+}
diff --git a/webapp/src/ts/modals/training-cards/training-cards.component.html b/webapp/src/ts/modals/training-cards/training-cards.component.html
index b702c2234f7..f9d8c604e86 100644
--- a/webapp/src/ts/modals/training-cards/training-cards.component.html
+++ b/webapp/src/ts/modals/training-cards/training-cards.component.html
@@ -1,36 +1,18 @@
 <mm-modal-layout
-  id="training-cards-modal"
-  [titleKey]="showConfirmExit ? 'training_cards.confirm.title' : modalTitleKey | translate"
-  (onCancel)="confirmExit(true)"
-  [hideFooter]="hideModalFooter"
+  [id]="MODAL_ID"
+  [titleKey]="showConfirmExit ? 'training_cards.confirm.title' : null"
+  (onCancel)="quit()"
+  [hideFooter]="!hasError"
   [hasEnketoForm]="true"
->
+  [class.has-error]="hasError">
 
-  <div class="item-content empty-selection" *ngIf="loadingContent">
-    <div><div class="loader"></div></div>
-  </div>
+  <training-cards-confirm *ngIf="showConfirmExit" (stay)="continueTraining()" (exit)="exitTraining($event)"/>
 
-  <div class="item-content empty-selection" *ngIf="!loadingContent && contentError">
-    <div>{{ errorTranslationKey | translate }}</div>
-  </div>
-
-  <div class="item-content" *ngIf="showConfirmExit && !loadingContent && !contentError">
-    <div>{{ 'training_cards.confirm.exit' | translate }}</div>
-    <div class="modal-footer">
-      <button test-id="cancel" mat-button color="primary" (click)="confirmExit(false)">{{ 'training_cards.confirm.button.no' | translate }}</button>
-      <button test-id="quit-training" mat-button color="primary" (click)="quitTraining()">{{ 'training_cards.confirm.button.yes' | translate }}</button>
-    </div>
-  </div>
-
-  <div class="item-content" [hidden]="showConfirmExit || loadingContent || contentError" [class.form-no-title]="formNoTitle">
-    <div class="body">
-      <mm-enketo
-        [formId]="formWrapperId"
-        [status]="enketoStatus"
-        (onSubmit)="saveForm()"
-        (onCancel)="confirmExit(true)">
-      </mm-enketo>
-    </div>
-  </div>
+  <training-cards-form
+    [hidden]="showConfirmExit"
+    [isEmbedded]="false"
+    (quit)="quit()"
+    (save)="close()"
+    (handleError)="hasError = true"/>
 
 </mm-modal-layout>
diff --git a/webapp/src/ts/modals/training-cards/training-cards.component.ts b/webapp/src/ts/modals/training-cards/training-cards.component.ts
index 47a9397499b..94277c1baf8 100644
--- a/webapp/src/ts/modals/training-cards/training-cards.component.ts
+++ b/webapp/src/ts/modals/training-cards/training-cards.component.ts
@@ -1,243 +1,83 @@
-import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest, Subscription } from 'rxjs';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 
-import { XmlFormsService } from '@mm-services/xml-forms.service';
-import { FormService } from '@mm-services/form.service';
 import { Selectors } from '@mm-selectors/index';
 import { GlobalActions } from '@mm-actions/global';
-import { GeolocationService } from '@mm-services/geolocation.service';
-import { TranslateService } from '@mm-services/translate.service';
 import { PerformanceService } from '@mm-services/performance.service';
-import { EnketoFormContext } from '@mm-services/enketo.service';
 
 @Component({
   selector: 'training-cards-modal',
   templateUrl: './training-cards.component.html'
 })
 export class TrainingCardsComponent implements OnInit, OnDestroy {
+  readonly MODAL_ID = 'training-cards-modal';
+  private readonly globalActions: GlobalActions;
+  private trackRender;
+  private trainingCardID;
+  hasError = false;
+  showConfirmExit = false;
+  subscriptions: Subscription = new Subscription();
 
   constructor(
-    private ngZone: NgZone,
-    private store: Store,
+    private readonly store: Store,
     private readonly router: Router,
-    private xmlFormsService: XmlFormsService,
-    private formService: FormService,
-    private geolocationService: GeolocationService,
-    private translateService: TranslateService,
-    private performanceService: PerformanceService,
-    private matDialogRef: MatDialogRef<TrainingCardsComponent>,
+    private readonly matDialogRef: MatDialogRef<TrainingCardsComponent>,
+    private readonly performanceService: PerformanceService,
   ) {
     this.globalActions = new GlobalActions(this.store);
   }
 
-  static id = 'training-cards-modal';
-  private geoHandle:any;
-  private globalActions;
-  private trackRender;
-  private trackEditDuration;
-  private trackSave;
-  private trackMetadata = { action: '', form: '' };
-  formNoTitle = false;
-  form;
-  trainingCardFormId;
-  formWrapperId = 'training-cards-form';
-  modalTitleKey = 'training_cards.modal.title';
-  loadingContent;
-  contentError;
-  hideModalFooter;
-  errorTranslationKey;
-  enketoError;
-  enketoStatus;
-  enketoSaving;
-  showConfirmExit;
-  nextUrl;
-  subscription: Subscription = new Subscription();
-
   ngOnInit() {
     this.trackRender = this.performanceService.track();
-    this.reset();
     this.subscribeToStore();
     this.globalActions.setTrainingCard({ isOpen: true });
   }
 
   ngOnDestroy() {
-    this.subscription.unsubscribe();
-    this.geoHandle?.cancel();
-    // old code checked whether the component is reused before unloading the form
-    // this is because AngularJS created the new "controller" before destroying the old one
-    // in Angular, unless specific RouteReuseStrategies are employed, components are always
-    // destroyed before new ones are created
-    // see https://github.com/angular/angular/blob/10.2.x/packages/router/src/operators/activate_routes.ts#L37
-    // for Angular behavior
-    // see https://github.com/medic/cht-core/issues/2198#issuecomment-210202785 for AngularJS behavior
-    this.formService.unload(this.form);
-    this.globalActions.clearEnketoStatus();
-    this.globalActions.setTrainingCard({ formId: null, isOpen: false, showConfirmExit: false, nextUrl: null });
-  }
-
-  private loadForm() {
-    this.ngZone.runOutsideAngular(() => this._loadForm());
-  }
-
-  private async _loadForm() {
-    try {
-      this.loadingContent = true;
-      this.hideModalFooter = true;
-      this.geoHandle && this.geoHandle.cancel();
-      this.geoHandle = this.geolocationService.init();
-      const form = await this.xmlFormsService.get(this.trainingCardFormId);
-      await this.ngZone.run(() => this.renderForm(form));
-    } catch (error) {
-      this.setError(error);
-      console.error('Training Cards :: Error fetching form.', error);
-    }
-  }
-
-  private async renderForm(formDoc) {
-    try {
-      const formContext = new EnketoFormContext(`#${this.formWrapperId}`, 'training-card', formDoc);
-      formContext.isFormInModal = true;
-      formContext.valuechangeListener = this.resetFormError.bind(this);
-
-      this.form = await this.formService.render(formContext);
-      this.formNoTitle = !formDoc?.title;
-      this.loadingContent = false;
-      this.recordPerformancePostRender();
-    } catch (error) {
-      this.setError(error);
-      console.error('Training Cards :: Error rendering form.', error);
-    }
+    this.subscriptions.unsubscribe();
+    this.globalActions.clearTrainingCards();
   }
 
   private subscribeToStore() {
-    const reduxSubscription = combineLatest([
-      this.store.select(Selectors.getEnketoStatus),
-      this.store.select(Selectors.getEnketoSavingStatus),
-      this.store.select(Selectors.getEnketoError),
-      this.store.select(Selectors.getTrainingCardFormId),
+    const subscription = combineLatest([
       this.store.select(Selectors.getTrainingCard),
-    ]).subscribe(([
-      enketoStatus,
-      enketoSaving,
-      enketoError,
-      trainingCardFormId,
-      trainingCard,
-    ]) => {
-      this.enketoStatus = enketoStatus;
-      this.enketoSaving = enketoSaving;
-      this.enketoError = enketoError;
-      this.showConfirmExit = trainingCard.showConfirmExit;
-      this.nextUrl = trainingCard.nextUrl;
-
-      if (trainingCardFormId && trainingCardFormId !== this.trainingCardFormId) {
-        this.trainingCardFormId = trainingCardFormId;
-        this.loadForm();
-      }
+      this.store.select(Selectors.getTrainingCardFormId),
+    ]).subscribe(([trainingCard, trainingCardID]) => {
+      this.showConfirmExit = trainingCard?.showConfirmExit;
+      this.trainingCardID = trainingCardID;
     });
-    this.subscription.add(reduxSubscription);
-  }
-
-  private reset() {
-    this.resetFormError();
-    this.contentError = false;
-    this.trainingCardFormId = null;
-    this.form = null;
-    this.loadingContent = true;
-    this.hideModalFooter = true;
-  }
-
-  private resetFormError() {
-    if (this.enketoError) {
-      this.globalActions.setEnketoError(null);
-    }
-  }
-
-  setError(error) {
-    this.errorTranslationKey = error?.translationKey || 'training_cards.error.loading';
-    this.loadingContent = false;
-    this.hideModalFooter = false;
-    this.contentError = true;
+    this.subscriptions.add(subscription);
   }
 
   close() {
-    this.globalActions.setTrainingCard({ formId: null, isOpen: false, showConfirmExit: false, nextUrl: null });
     this.matDialogRef.close();
+    this.globalActions.clearTrainingCards();
   }
 
-  async saveForm() {
-    if (this.enketoSaving) {
-      console.debug('Attempted to call TrainingCardsComponent:saveForm more than once');
-      return;
-    }
-
-    this.recordPerformancePreSave();
-    this.globalActions.setEnketoSavingStatus(true);
-    this.resetFormError();
-
-    try {
-      const docs = await this.formService.save(this.trainingCardFormId, this.form, this.geoHandle);
-      console.debug('Saved form and associated docs', docs);
-      const snackText = await this.translateService.get('training_cards.form.saved');
-      this.globalActions.setSnackbarContent(snackText);
-      this.globalActions.setEnketoSavingStatus(false);
-      this.formService.unload(this.form);
-      this.recordPerformancePostSave();
-      this.close();
-
-    } catch (error) {
-      this.globalActions.setEnketoSavingStatus(false);
-      console.error('Training Cards :: Error submitting form data.', error);
-      const friendlyMessage = await this.translateService.get('training_cards.error.save');
-      this.globalActions.setEnketoError(friendlyMessage);
-    }
+  continueTraining() {
+    this.globalActions.setTrainingCard({ showConfirmExit: false });
   }
 
-  private recordPerformancePostRender() {
-    this.trackMetadata.action = 'add';
-    this.trackMetadata.form =  this.trainingCardFormId;
+  exitTraining(nextUrl: string) {
     this.trackRender?.stop({
-      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'render' ].join(':')
+      name: [ 'enketo', this.trainingCardID, 'add', 'quit' ].join(':'),
     });
-    this.trackEditDuration = this.performanceService.track();
-  }
-
-  private recordPerformancePreSave() {
-    this.trackEditDuration?.stop({
-      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'user_edit_time' ].join(':'),
-    });
-    this.trackSave = this.performanceService.track();
-  }
 
-  private recordPerformancePostSave() {
-    this.trackSave?.stop({
-      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'save' ].join(':'),
-    });
-  }
+    if (nextUrl) {
+      this.router.navigateByUrl(nextUrl);
+    }
 
-  private recordPerformanceQuitTraining() {
-    this.trackEditDuration?.stop({
-      name: [ 'enketo', this.trackMetadata.form, this.trackMetadata.action, 'quit' ].join(':'),
-    });
+    this.close();
   }
 
-  confirmExit(confirm) {
-    if (this.contentError) {
-      this.close();
+  quit() {
+    if (!this.hasError) {
+      this.globalActions.setTrainingCard({ showConfirmExit: true });
       return;
     }
-    this.showConfirmExit = confirm;
-  }
-
-  quitTraining() {
-    this.recordPerformanceQuitTraining();
-
-    if (this.nextUrl) {
-      this.router.navigateByUrl(this.nextUrl);
-    }
-
     this.close();
   }
 }
diff --git a/webapp/src/ts/modules/messages/messages.component.ts b/webapp/src/ts/modules/messages/messages.component.ts
index a9bf8aa149a..776c6dcc409 100644
--- a/webapp/src/ts/modules/messages/messages.component.ts
+++ b/webapp/src/ts/modules/messages/messages.component.ts
@@ -17,6 +17,7 @@ import { FastAction, FastActionButtonService } from '@mm-services/fast-action-bu
 import { PerformanceService } from '@mm-services/performance.service';
 import { ExtractLineageService } from '@mm-services/extract-lineage.service';
 import { ButtonType } from '@mm-components/fast-action-button/fast-action-button.component';
+import { UserContactService } from '@mm-services/user-contact.service';
 
 @Component({
   templateUrl: './messages.component.html'
@@ -37,16 +38,17 @@ export class MessagesComponent implements OnInit, OnDestroy {
   userLineageLevel;
 
   constructor(
-    private router: Router,
-    private store: Store,
-    private changesService: ChangesService,
-    private fastActionButtonService:FastActionButtonService,
-    private messageContactService: MessageContactService,
-    private exportService: ExportService,
-    private modalService: ModalService,
-    private responsiveService: ResponsiveService,
-    private performanceService: PerformanceService,
-    private extractLineageService: ExtractLineageService,
+    private readonly router: Router,
+    private readonly store: Store,
+    private readonly changesService: ChangesService,
+    private readonly fastActionButtonService:FastActionButtonService,
+    private readonly messageContactService: MessageContactService,
+    private readonly exportService: ExportService,
+    private readonly modalService: ModalService,
+    private readonly responsiveService: ResponsiveService,
+    private readonly performanceService: PerformanceService,
+    private readonly extractLineageService: ExtractLineageService,
+    private readonly userContactService: UserContactService
   ) {
     this.globalActions = new GlobalActions(store);
     this.messagesActions = new MessagesActions(store);
@@ -54,7 +56,7 @@ export class MessagesComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.trackPerformance = this.performanceService.track();
-    this.userLineageLevel = this.extractLineageService.getUserLineageToRemove();
+    this.userLineageLevel = this.userContactService.getUserLineageToRemove();
     this.subscribeToStore();
     this.updateConversations().then(() => this.displayFirstConversation(this.conversations));
     this.watchForChanges();
diff --git a/webapp/src/ts/modules/modules.module.ts b/webapp/src/ts/modules/modules.module.ts
index 38705b91c54..3adb183516c 100644
--- a/webapp/src/ts/modules/modules.module.ts
+++ b/webapp/src/ts/modules/modules.module.ts
@@ -41,11 +41,14 @@ import { AnalyticsTargetAggregatesSidebarFilterComponent }
 import {
   AnalyticsTargetAggregatesDetailComponent
 } from '@mm-modules/analytics/analytics-target-aggregates-detail.component';
+import { TrainingsComponent } from '@mm-modules/trainings/trainings.component';
+import { TrainingsContentComponent } from '@mm-modules/trainings/trainings-content.component';
 import { TasksComponent } from '@mm-modules/tasks/tasks.component';
 import { TasksContentComponent } from '@mm-modules/tasks/tasks-content.component';
 import { TasksGroupComponent } from '@mm-modules/tasks/tasks-group.component';
 import { TestingComponent } from '@mm-modules/testing/testing.component';
 import { DirectivesModule } from '@mm-directives/directives.module';
+import { ModalsModule } from '@mm-modals/modals.module';
 
 @NgModule({
   declarations: [
@@ -74,6 +77,8 @@ import { DirectivesModule } from '@mm-directives/directives.module';
     AnalyticsTargetAggregatesComponent,
     AnalyticsTargetAggregatesDetailComponent,
     AnalyticsTargetAggregatesSidebarFilterComponent,
+    TrainingsComponent,
+    TrainingsContentComponent,
     TasksComponent,
     TasksContentComponent,
     TasksGroupComponent,
@@ -94,6 +99,7 @@ import { DirectivesModule } from '@mm-directives/directives.module';
     MatDialogModule,
     MatExpansionModule,
     MatMenuModule,
+    ModalsModule,
   ],
   exports: [
     HomeComponent,
@@ -104,6 +110,8 @@ import { DirectivesModule } from '@mm-directives/directives.module';
     ReportsComponent,
     MessagesComponent,
     ContactsComponent,
+    TrainingsComponent,
+    TrainingsContentComponent,
     PrivacyPolicyComponent,
     TasksComponent,
   ]
diff --git a/webapp/src/ts/modules/reports/reports.component.ts b/webapp/src/ts/modules/reports/reports.component.ts
index d88b2d97713..b5e4c916b2c 100644
--- a/webapp/src/ts/modules/reports/reports.component.ts
+++ b/webapp/src/ts/modules/reports/reports.component.ts
@@ -108,7 +108,7 @@ export class ReportsComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async ngAfterViewInit() {
-    this.userLineageLevel = this.extractLineageService.getUserLineageToRemove();
+    this.userLineageLevel = this.userContactService.getUserLineageToRemove();
     await this.checkPermissions();
     this.subscribeSidebarFilter();
     this.doInitialSearch();
diff --git a/webapp/src/ts/modules/tasks/tasks.component.html b/webapp/src/ts/modules/tasks/tasks.component.html
index bad7260cce7..faea4ce565b 100644
--- a/webapp/src/ts/modules/tasks/tasks.component.html
+++ b/webapp/src/ts/modules/tasks/tasks.component.html
@@ -6,10 +6,10 @@
     <div id="tasks-list" class="col-sm-4 inbox-items left-pane">
       <ul *ngIf="!errorStack && hasTasks">
         <li *ngFor="let task of tasksList; trackBy: listTrackBy"
-            [attr.data-record-id]="task._id"
-            [class.selected] = "task.selected"
-            [class.overdue]="task.overdue"
-            class="content-row">
+          [attr.data-record-id]="task._id"
+          [class.selected]="task.selected"
+          [class.overdue]="task.overdue"
+          class="content-row">
           <a [routerLink]="['/', 'tasks', task._id]" [state]="{ tab: 'tasks', id: task._id }">
             <div *ngIf="task.icon" class="icon" [innerHTML]="task.icon | resourceIcon"></div>
             <div class="content">
diff --git a/webapp/src/ts/modules/tasks/tasks.component.ts b/webapp/src/ts/modules/tasks/tasks.component.ts
index d80bc012261..ac2713ae3f1 100644
--- a/webapp/src/ts/modules/tasks/tasks.component.ts
+++ b/webapp/src/ts/modules/tasks/tasks.component.ts
@@ -13,6 +13,7 @@ import { GlobalActions } from '@mm-actions/global';
 import { LineageModelGeneratorService } from '@mm-services/lineage-model-generator.service';
 import { PerformanceService } from '@mm-services/performance.service';
 import { ExtractLineageService } from '@mm-services/extract-lineage.service';
+import { UserContactService } from '@mm-services/user-contact.service';
 import { getProperty } from '../../libs/schema';
 
 @Component({
@@ -20,13 +21,14 @@ import { getProperty } from '../../libs/schema';
 })
 export class TasksComponent implements OnInit, OnDestroy {
   constructor(
-    private store: Store,
-    private changesService: ChangesService,
-    private contactTypesService: ContactTypesService,
-    private rulesEngineService: RulesEngineService,
-    private performanceService: PerformanceService,
-    private lineageModelGeneratorService: LineageModelGeneratorService,
-    private extractLineageService: ExtractLineageService,
+    private readonly store: Store,
+    private readonly changesService: ChangesService,
+    private readonly contactTypesService: ContactTypesService,
+    private readonly rulesEngineService: RulesEngineService,
+    private readonly performanceService: PerformanceService,
+    private readonly lineageModelGeneratorService: LineageModelGeneratorService,
+    private readonly extractLineageService: ExtractLineageService,
+    private readonly userContactService: UserContactService
   ) {
     this.tasksActions = new TasksActions(store);
     this.globalActions = new GlobalActions(store);
@@ -103,7 +105,7 @@ export class TasksComponent implements OnInit, OnDestroy {
     this.hasTasks = false;
     this.loading = true;
     this.debouncedReload = _debounce(this.refreshTasks.bind(this), 1000, { maxWait: 10 * 1000 });
-    this.userLineageLevel = this.extractLineageService.getUserLineageToRemove();
+    this.userLineageLevel = this.userContactService.getUserLineageToRemove();
     this.refreshTasks();
   }
 
diff --git a/webapp/src/ts/modules/trainings/trainings-content.component.html b/webapp/src/ts/modules/trainings/trainings-content.component.html
new file mode 100644
index 00000000000..f9843168916
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings-content.component.html
@@ -0,0 +1,21 @@
+<div class="content-pane right-pane">
+  <div class="item-content empty-selection col-sm-8" *ngIf="showNoSelection">
+    <div>{{ 'training_materials.page.no_selected' | translate }}</div>
+  </div>
+
+  <training-cards-form
+    [hidden]="showNoSelection"
+    [isEmbedded]="true"
+    (quit)="quit()"
+    (save)="close()"
+    (handleError)="hasError = true"/>
+</div>
+
+<ng-template #confirmModal>
+  <mm-modal-layout
+    id="training-cards-confirm"
+    [titleKey]="'training_cards.confirm.title' | translate"
+    [hideFooter]="true">
+    <training-cards-confirm (stay)="continueTraining()" (exit)="exitTraining($event)"/>
+  </mm-modal-layout>
+</ng-template>
diff --git a/webapp/src/ts/modules/trainings/trainings-content.component.ts b/webapp/src/ts/modules/trainings/trainings-content.component.ts
new file mode 100644
index 00000000000..1fb5c052965
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings-content.component.ts
@@ -0,0 +1,112 @@
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+
+import { GlobalActions } from '@mm-actions/global';
+import { ModalService } from '@mm-services/modal.service';
+import { PerformanceService } from '@mm-services/performance.service';
+import { Selectors } from '@mm-selectors/index';
+
+@Component({
+  selector: 'training-content',
+  templateUrl: './trainings-content.component.html'
+})
+export class TrainingsContentComponent implements OnInit, OnDestroy {
+  @ViewChild('confirmModal') confirmModalTemplate;
+  private readonly globalActions: GlobalActions;
+  private confirmModalRef;
+  private trackRender;
+  private trainingCardID;
+  private canExit = false;
+  showNoSelection = false;
+  showConfirmExit = false;
+  hasError = false;
+  subscriptions: Subscription = new Subscription();
+
+  constructor(
+    private readonly store: Store,
+    private readonly route: ActivatedRoute,
+    private readonly router: Router,
+    private readonly modalService: ModalService,
+    private readonly performanceService: PerformanceService,
+  ) {
+    this.globalActions = new GlobalActions(this.store);
+  }
+
+  ngOnInit() {
+    this.trackRender = this.performanceService.track();
+    this.subscribeToRouteParams();
+    this.subscribeToStore();
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+    this.globalActions.clearNavigation();
+    this.globalActions.clearTrainingCards();
+  }
+
+  private subscribeToStore() {
+    const reduxSubscription = this.store
+      .select(Selectors.getTrainingCardFormId)
+      .subscribe(trainingCardID => this.trainingCardID = trainingCardID);
+    this.subscriptions.add(reduxSubscription);
+  }
+
+  private subscribeToRouteParams() {
+    const routeSubscription = this.route.params.subscribe(params => {
+      this.globalActions.setTrainingCard({ formId: params?.id || null });
+      if (!params?.id) {
+        this.showNoSelection = true;
+        this.globalActions.setShowContent(false);
+      }
+    });
+    this.subscriptions.add(routeSubscription);
+  }
+
+  close(nextUrl?) {
+    this.canExit = true;
+    this.globalActions.clearNavigation();
+    this.globalActions.clearTrainingCards();
+    if (nextUrl) {
+      return this.router.navigateByUrl(nextUrl);
+    }
+    return this.router.navigate([ '/', 'trainings' ]);
+  }
+
+  exitTraining(nextUrl: string) {
+    this.trackRender?.stop({
+      name: [ 'enketo', this.trainingCardID, 'add', 'quit' ].join(':'),
+    });
+
+    this.close(nextUrl);
+    this.confirmModalRef?.close();
+  }
+
+  continueTraining() {
+    this.confirmModalRef?.close();
+  }
+
+  quit() {
+    if (this.hasError) {
+      return this.close();
+    }
+
+    this.showConfirmExit = true;
+    this.confirmModalRef = this.modalService.show(this.confirmModalTemplate);
+    const subscription = this.confirmModalRef
+      ?.afterClosed()
+      .subscribe(() => this.showConfirmExit = false);
+    this.subscriptions.add(subscription);
+  }
+
+  canDeactivate(nextUrl) {
+    if (this.canExit) {
+      this.canExit = false;
+      return true;
+    }
+    this.globalActions.setTrainingCard({ nextUrl });
+    this.quit();
+    return false;
+  }
+}
diff --git a/webapp/src/ts/modules/trainings/trainings-route.guard.provider.ts b/webapp/src/ts/modules/trainings/trainings-route.guard.provider.ts
new file mode 100644
index 00000000000..6fe39900d6b
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings-route.guard.provider.ts
@@ -0,0 +1,18 @@
+import { CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Injectable } from '@angular/core';
+
+import { TrainingsContentComponent } from '@mm-modules/trainings/trainings-content.component';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TrainingsRouteGuardProvider implements CanDeactivate<TrainingsContentComponent> {
+  canDeactivate(
+    component:TrainingsContentComponent,
+    currentRoute:ActivatedRouteSnapshot,
+    currentState:RouterStateSnapshot,
+    nextState:RouterStateSnapshot,
+  ) {
+    return component.canDeactivate(nextState.url);
+  }
+}
diff --git a/webapp/src/ts/modules/trainings/trainings.component.html b/webapp/src/ts/modules/trainings/trainings.component.html
new file mode 100644
index 00000000000..95ff6bf484e
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings.component.html
@@ -0,0 +1,42 @@
+<mm-tool-bar title="training_materials.page.title"/>
+
+<div class="inner">
+  <div class="inbox page">
+
+    <div id="trainings-list" class="col-sm-4 inbox-items left-pane">
+      <div class="items-container">
+        <ul *ngIf="trainingList?.length">
+          <li *ngFor="let training of trainingList; trackBy: trackBy"
+            class="content-row"
+            [attr.data-record-id]="training.code"
+            [class.selected]="training.code === selectedTrainingId"
+            [class.completed]="training.isCompletedTraining">
+
+            <a [routerLink]="['/', 'trainings', training.code]" [state]="{ tab: 'trainings', id: training.code }">
+              <div class="content">
+                <div class="heading">
+                  <h4>
+                    <span *ngIf="training.title">{{ training.title }}</span>
+                    <span *ngIf="!training.title">{{ training.code }}</span>
+                  </h4>
+                  <mat-icon *ngIf="training.isCompletedTraining" class="mat-icon-check" svgIcon="icon-check"/>
+                </div>
+              </div>
+            </a>
+
+          </li>
+        </ul>
+
+        <p class="loading-status" *ngIf="!loading && !trainingList?.length">{{ 'training_materials.page.no_trainings' | translate }}</p>
+        <p class="loading-status" *ngIf="!loading && trainingList?.length && !moreTrainings">
+          {{ 'training_materials.page.no_more_trainings' | translate }}
+        </p>
+        <div class="loader" *ngIf="loading"></div>
+        <div class="padding"></div>
+      </div>
+    </div>
+
+    <router-outlet/>
+
+  </div>
+</div>
diff --git a/webapp/src/ts/modules/trainings/trainings.component.ts b/webapp/src/ts/modules/trainings/trainings.component.ts
new file mode 100644
index 00000000000..802e3e0a486
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings.component.ts
@@ -0,0 +1,129 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+
+import { GlobalActions } from '@mm-actions/global';
+import { PerformanceService } from '@mm-services/performance.service';
+import { TrainingCardsService, TrainingMaterial } from '@mm-services/training-cards.service';
+import { Selectors } from '@mm-selectors/index';
+import { ScrollLoaderProvider } from '@mm-providers/scroll-loader.provider';
+
+const PAGE_SIZE = 50;
+
+@Component({
+  templateUrl: './trainings.component.html'
+})
+export class TrainingsComponent implements OnInit, OnDestroy {
+  private readonly globalActions: GlobalActions;
+  private trackInitialLoadPerformance;
+  private isInitialized;
+  private trainingForms;
+  selectedTrainingId: null | string = null;
+  subscriptions: Subscription = new Subscription();
+  trainingList: TrainingMaterial[] = [];
+  moreTrainings = true;
+  loading = true;
+
+  constructor(
+    private readonly store: Store,
+    private readonly performanceService: PerformanceService,
+    private readonly trainingCardsService: TrainingCardsService,
+    private readonly scrollLoaderProvider: ScrollLoaderProvider,
+  ) {
+    this.globalActions = new GlobalActions(this.store);
+  }
+
+  ngOnInit() {
+    this.trackInitialLoadPerformance = this.performanceService.track();
+    this.subscribeToTrainingMaterials();
+    this.subscribeToSelectedTraining();
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+    this.globalActions.unsetSelected();
+  }
+
+  private subscribeToTrainingMaterials() {
+    const trainingSubscription = this.store
+      .select(Selectors.getTrainingMaterials)
+      .subscribe(forms => {
+        this.trainingList = [];
+        this.trainingForms = forms;
+        this.isInitialized = this.getTrainings();
+      });
+    this.subscriptions.add(trainingSubscription);
+  }
+
+  private subscribeToSelectedTraining() {
+    const selectedTraining = this.store
+      .select(Selectors.getTrainingCardFormId)
+      .subscribe(newSelectedId => this.isInitialized?.then(() => {
+        this.refreshList(this.selectedTrainingId, newSelectedId);
+        this.selectedTrainingId = newSelectedId;
+      }));
+    this.subscriptions.add(selectedTraining);
+  }
+
+  private refreshList(oldSelectedId, newSelectedId) {
+    const isTrainingClosing = oldSelectedId && !newSelectedId;
+    if (!isTrainingClosing) {
+      return;
+    }
+
+    const isUncompletedTraining = this.trainingList?.find(training => {
+      return training.code === oldSelectedId && !training.isCompletedTraining;
+    });
+
+    if (isUncompletedTraining) {
+      this.trainingList = [];
+      this.getTrainings();
+    }
+  }
+
+  async getTrainings() {
+    if (!this.trainingForms?.length) {
+      this.loading = false;
+      return;
+    }
+
+    try {
+      this.loading = true;
+      const list = await this.trainingCardsService.getNextTrainings(
+        this.trainingForms,
+        PAGE_SIZE,
+        this.trainingList.length,
+      ) ?? [];
+
+      this.moreTrainings = list.length >= PAGE_SIZE;
+      this.trainingList = [ ...this.trainingList, ...list ];
+
+      await this.recordInitialLoadPerformance();
+      this.initScroll();
+    } catch (error) {
+      console.error('Error getting training materials.', error);
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  private async recordInitialLoadPerformance() {
+    if (!this.trackInitialLoadPerformance) {
+      return;
+    }
+    await this.trackInitialLoadPerformance.stop({ name: 'training_materials_list:load', recordApdex: true });
+    this.trackInitialLoadPerformance = null;
+  }
+
+  trackBy(index, training) {
+    return training._id + index + training._rev + training.selected;
+  }
+
+  private initScroll() {
+    this.scrollLoaderProvider.init(() => {
+      if (!this.loading && this.moreTrainings) {
+        this.getTrainings();
+      }
+    });
+  }
+}
diff --git a/webapp/src/ts/modules/trainings/trainings.routes.ts b/webapp/src/ts/modules/trainings/trainings.routes.ts
new file mode 100644
index 00000000000..54adf17b417
--- /dev/null
+++ b/webapp/src/ts/modules/trainings/trainings.routes.ts
@@ -0,0 +1,28 @@
+import { Routes } from '@angular/router';
+
+import { AppRouteGuardProvider } from '../../app-route.guard.provider';
+import { TrainingsComponent } from '@mm-modules/trainings/trainings.component';
+import { TrainingsContentComponent } from '@mm-modules/trainings/trainings-content.component';
+import { TrainingsRouteGuardProvider } from '@mm-modules/trainings/trainings-route.guard.provider';
+
+export const routes: Routes = [
+  {
+    path: 'trainings',
+    component: TrainingsComponent,
+    data: { permissions: [ 'can_edit' ], tab: 'trainings', hideTraining: true },
+    canActivate: [ AppRouteGuardProvider ],
+    children: [
+      {
+        path: '',
+        component: TrainingsContentComponent,
+        data: { hideTraining: true },
+      },
+      {
+        path: ':id',
+        component: TrainingsContentComponent,
+        data: { hideTraining: true },
+        canDeactivate: [ TrainingsRouteGuardProvider ],
+      },
+    ]
+  },
+];
diff --git a/webapp/src/ts/reducers/global.ts b/webapp/src/ts/reducers/global.ts
index e1c6f4c5651..c94c7124b9c 100644
--- a/webapp/src/ts/reducers/global.ts
+++ b/webapp/src/ts/reducers/global.ts
@@ -27,6 +27,7 @@ const initialState: GlobalState = {
   trainingCard: { formId: null, isOpen: false, showConfirmExit: false, nextUrl: null },
   sidebarMenu: { isOpen: false },
   forms: null,
+  trainingMaterials: null,
   lastChangedDoc: false,
   loadingContent: false,
   processingReportVerification: false,
@@ -77,6 +78,9 @@ const _globalReducer = createReducer(
   on(Actions.setForms, (state, { payload: { forms } }) => {
     return { ...state, forms };
   }),
+  on(Actions.setTrainingMaterials, (state, { payload: { trainingMaterials } }) => {
+    return { ...state, trainingMaterials };
+  }),
   on(Actions.clearFilters, (state, { payload: { skip } }) => {
     const newValue = skip && state.filters[skip] ? { [skip]: state.filters[skip] } : {};
     return { ...state, filters: newValue };
@@ -192,6 +196,7 @@ export interface GlobalState {
   trainingCard: TrainingCardState;
   sidebarMenu: SidebarMenuState;
   forms: null | Record<string, any>[];
+  trainingMaterials: null | Record<string, any>[];
   lastChangedDoc: boolean | Record<string, any>;
   loadingContent: boolean;
   processingReportVerification: boolean;
diff --git a/webapp/src/ts/reducers/tasks.ts b/webapp/src/ts/reducers/tasks.ts
index 8768ff14d90..6bad3eb217b 100644
--- a/webapp/src/ts/reducers/tasks.ts
+++ b/webapp/src/ts/reducers/tasks.ts
@@ -47,6 +47,7 @@ const _tasksReducer = createReducer(
 
   on(Actions.setLastSubmittedTask, (state, { payload: { task } }) => ({
     ...state,
+    tasksList: state.tasksList.filter(t => task?._id !== t._id),
     taskGroup: {
       ...state.taskGroup,
       lastSubmittedTask: task
diff --git a/webapp/src/ts/selectors/index.ts b/webapp/src/ts/selectors/index.ts
index 83b66d7658d..95c5fc52eb1 100644
--- a/webapp/src/ts/selectors/index.ts
+++ b/webapp/src/ts/selectors/index.ts
@@ -25,6 +25,7 @@ export const Selectors = {
   getShowContent: createSelector(getGlobalState, (globalState) => globalState.showContent),
   getSelectMode: createSelector(getGlobalState, (globalState) => globalState.selectMode),
   getForms: createSelector(getGlobalState, (globalState) => globalState.forms),
+  getTrainingMaterials: createSelector(getGlobalState, (globalState) => globalState.trainingMaterials),
   getFilters: createSelector(getGlobalState, (globalState) => globalState.filters),
   getSidebarFilter: createSelector(getGlobalState, (globalState) => globalState.sidebarFilter),
   getSearchBar: createSelector(getGlobalState, (globalState) => globalState.searchBar),
diff --git a/webapp/src/ts/services/extract-lineage.service.ts b/webapp/src/ts/services/extract-lineage.service.ts
index 3bcaeb88de8..b73836ee164 100644
--- a/webapp/src/ts/services/extract-lineage.service.ts
+++ b/webapp/src/ts/services/extract-lineage.service.ts
@@ -1,19 +1,12 @@
 import { Injectable } from '@angular/core';
 
-import { UserSettingsService } from '@mm-services/user-settings.service';
-import { UserContactService } from '@mm-services/user-contact.service';
-import { AuthService } from '@mm-services/auth.service';
-
 @Injectable({
   providedIn: 'root'
 })
 export class ExtractLineageService {
 
-  constructor(
-    private userSettingsService: UserSettingsService,
-    private userContactService: UserContactService,
-    private authService: AuthService,
-  ) { }
+  constructor() {
+  }
 
   extract(contact) {
     if (!contact) {
@@ -32,20 +25,6 @@ export class ExtractLineageService {
     return result;
   }
 
-  async getUserLineageToRemove(): Promise<string | null> {
-    if (this.authService.online(true)) {
-      return null;
-    }
-
-    const { facility_id }:any = await this.userSettingsService.get();
-    if (!facility_id || (Array.isArray(facility_id) && facility_id.length > 1)) {
-      return null;
-    }
-
-    const user = await this.userContactService.get();
-    return user?.parent?.name as string;
-  }
-
   removeUserFacility(lineage: string[], userLineageLevel: string): string[] | undefined {
     if (!lineage?.length) {
       return;
diff --git a/webapp/src/ts/services/rules-engine.service.ts b/webapp/src/ts/services/rules-engine.service.ts
index 8e7a4712e90..cf16f0e1380 100644
--- a/webapp/src/ts/services/rules-engine.service.ts
+++ b/webapp/src/ts/services/rules-engine.service.ts
@@ -214,6 +214,7 @@ export class RulesEngineService implements OnDestroy {
 
   private dirtyContactCallback(change) {
     const subjectIds = [this.isReport(change.doc) ? RegistrationUtils.getSubjectId(change.doc) : change.id];
+    this.observable.next(subjectIds);
 
     if (this.debounceActive[this.CHANGE_WATCHER_KEY]?.active) {
       const oldSubjectIds = this.debounceActive[this.CHANGE_WATCHER_KEY].params;
@@ -238,7 +239,6 @@ export class RulesEngineService implements OnDestroy {
       this.telemetryService.record(this.getTelemetryTrackName('refresh', 'dirty-contacts'), contactIds.length);
 
       await this.rulesEngineCore.updateEmissionsFor(contactIds);
-      this.observable.next(contactIds);
       trackPerformance?.stop({ name: this.getTelemetryTrackName('refresh') });
     }, this.DEBOUNCE_CHANGE_MILLIS);
 
diff --git a/webapp/src/ts/services/training-cards.service.ts b/webapp/src/ts/services/training-cards.service.ts
index f3618d05d9d..b3b7d2346b1 100644
--- a/webapp/src/ts/services/training-cards.service.ts
+++ b/webapp/src/ts/services/training-cards.service.ts
@@ -3,6 +3,7 @@ import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 import { v4 as uuid } from 'uuid';
 import { first } from 'rxjs/operators';
+import { combineLatest } from 'rxjs';
 
 import { XmlFormsService } from '@mm-services/xml-forms.service';
 import { TrainingCardsComponent } from '@mm-modals/training-cards/training-cards.component';
@@ -11,6 +12,9 @@ import { GlobalActions } from '@mm-actions/global';
 import { ModalService } from '@mm-services/modal.service';
 import { SessionService } from '@mm-services/session.service';
 import { RouteSnapshotService } from '@mm-services/route-snapshot.service';
+import { Selectors } from '@mm-selectors/index';
+import { TranslateService } from '@ngx-translate/core';
+import { TranslateFromService } from '@mm-services/translate-from.service';
 
 export const TRAINING_PREFIX: string = 'training:';
 
@@ -22,22 +26,46 @@ export class TrainingCardsService {
   private readonly STORAGE_KEY_LAST_VIEWED_DATE = 'training-cards-last-viewed-date';
 
   constructor(
-    private store: Store,
-    private xmlFormsService: XmlFormsService,
-    private dbService: DbService,
-    private modalService: ModalService,
-    private sessionService: SessionService,
-    private routeSnapshotService: RouteSnapshotService,
+    private readonly store: Store,
+    private readonly xmlFormsService: XmlFormsService,
+    private readonly dbService: DbService,
+    private readonly modalService: ModalService,
+    private readonly sessionService: SessionService,
+    private readonly routeSnapshotService: RouteSnapshotService,
+    private readonly translateService: TranslateService,
+    private readonly translateFromService: TranslateFromService,
   ) {
     this.globalActions = new GlobalActions(this.store);
+    this.subscribeToStore();
+  }
+
+  private subscribeToStore(): void {
+    combineLatest([
+      this.store.select(Selectors.getPrivacyPolicyAccepted),
+      this.store.select(Selectors.getShowPrivacyPolicy),
+      this.store.select(Selectors.getTrainingMaterials),
+    ]).subscribe(([ privacyPolicyAccepted, showPrivacyPolicy, xforms ]) => {
+      this.displayTrainingCards(xforms, showPrivacyPolicy, privacyPolicyAccepted);
+    });
+  }
+
+  private getFormTitle(labelKey?: string, label?: string): string|undefined {
+    if (labelKey) {
+      return this.translateService.instant(labelKey);
+    }
+
+    if (label) {
+      return this.translateFromService.get(label);
+    }
   }
 
   private getAvailableTrainingCards(xForms, userCtx) {
     const today = moment();
 
     return xForms
-      .map(xForm => ({
+      ?.map(xForm => ({
         id: xForm._id,
+        title: this.getFormTitle(xForm.titleKey, xForm.title),
         code: xForm.internalId,
         startDate: xForm.context?.start_date ? moment(xForm.context.start_date) : today.clone(),
         duration: xForm.context?.duration,
@@ -80,47 +108,51 @@ export class TrainingCardsService {
     return docs?.rows?.length ? new Set(docs.rows.map(row => row?.doc?.form)) : new Set();
   }
 
-  private async handleTrainingCards(error, xForms) {
-    if (error) {
-      console.error('Training Cards :: Error fetching forms.', error);
+  private openModal(form) {
+    this.globalActions.setTrainingCard({ formId: form?.code });
+
+    this.modalService
+      .show(TrainingCardsComponent, { closeOnNavigation: false, width: '700px' })
+      ?.afterOpened()
+      .pipe(first())
+      .subscribe(() => {
+        const key = this.getLocalStorageKey();
+        if (key) {
+          window.localStorage.setItem(key, new Date().toISOString());
+        }
+      });
+  }
+
+  private canDisplayTrainingCards(trainingForms, showPrivacyPolicy, privacyPolicyAccepted) {
+    if (!trainingForms?.length
+      || (showPrivacyPolicy && !privacyPolicyAccepted)
+      || this.hasBeenDisplayed()
+    ) {
+      return false;
+    }
+
+    const routeSnapshot = this.routeSnapshotService.get();
+    return !routeSnapshot?.data?.hideTraining;
+  }
+
+  async displayTrainingCards(trainingForms, showPrivacyPolicy, privacyPolicyAccepted) {
+    if (!this.canDisplayTrainingCards(trainingForms, showPrivacyPolicy, privacyPolicyAccepted)) {
       return;
     }
 
     try {
-      const firstChronologicalTrainingCard = await this.getFirstChronologicalForm(xForms);
+      const firstChronologicalTrainingCard = await this.getFirstChronologicalForm(trainingForms);
       if (!firstChronologicalTrainingCard) {
         return;
       }
 
-      this.globalActions.setTrainingCard({ formId: firstChronologicalTrainingCard.code });
+      this.openModal(firstChronologicalTrainingCard);
     } catch (error) {
       console.error('Training Cards :: Error showing modal.', error);
       return;
     }
   }
 
-  displayTrainingCards() {
-    if (this.hasBeenDisplayed()) {
-      return;
-    }
-
-    const routeSnapshot = this.routeSnapshotService.get();
-    if (routeSnapshot?.data?.hideTraining) {
-      return;
-    }
-
-    this.modalService
-      .show(TrainingCardsComponent, { closeOnNavigation: false })
-      ?.afterOpened()
-      .pipe(first())
-      .subscribe(() => {
-        const key = this.getLocalStorageKey();
-        if (key) {
-          window.localStorage.setItem(key, new Date().toISOString());
-        }
-      });
-  }
-
   private async getFirstChronologicalForm(xForms) {
     const userCtx = this.sessionService.userCtx();
     const trainingCards = this.getAvailableTrainingCards(xForms, userCtx) || [];
@@ -139,7 +171,13 @@ export class TrainingCardsService {
     this.xmlFormsService.subscribe(
       'TrainingCards',
       { trainingCards: true },
-      (error, xForms) => this.handleTrainingCards(error, xForms)
+      (error, xForms) => {
+        if (error) {
+          console.error('Training Cards :: Error fetching forms.', error);
+          return;
+        }
+        this.globalActions.setTrainingMaterials(xForms);
+      }
     );
   }
 
@@ -182,4 +220,28 @@ export class TrainingCardsService {
 
     return `${this.STORAGE_KEY_LAST_VIEWED_DATE}-${username}`;
   }
+
+  public async getNextTrainings(xForms, pageSize, skip): Promise<TrainingMaterial[] | undefined> {
+    const userCtx = this.sessionService.userCtx();
+    const availableTrainingCards = this.getAvailableTrainingCards(xForms, userCtx);
+    const trainingCards = availableTrainingCards?.slice(skip, skip + pageSize);
+    if (!trainingCards.length) {
+      return;
+    }
+
+    const completedTrainings = await this.getCompletedTrainings(userCtx);
+    return trainingCards
+      .map(form => ({ ...form, isCompletedTraining: completedTrainings.has(form.code) }))
+      .sort((a, b) => a.startDate.diff(b.startDate));
+  }
+}
+
+export interface TrainingMaterial {
+  id: string;
+  title: string;
+  code: string;
+  startDate: Date;
+  duration: number;
+  userRoles: string[];
+  isCompletedTraining: boolean;
 }
diff --git a/webapp/src/ts/services/user-contact.service.ts b/webapp/src/ts/services/user-contact.service.ts
index a446736870e..2fb29369a90 100644
--- a/webapp/src/ts/services/user-contact.service.ts
+++ b/webapp/src/ts/services/user-contact.service.ts
@@ -3,6 +3,7 @@ import { Person, Qualifier } from '@medic/cht-datasource';
 
 import { UserSettingsService } from '@mm-services/user-settings.service';
 import { CHTDatasourceService } from '@mm-services/cht-datasource.service';
+import { AuthService } from '@mm-services/auth.service';
 import { getProperty } from '../libs/schema';
 
 @Injectable({
@@ -12,7 +13,8 @@ export class UserContactService {
   private readonly getPerson: ReturnType<typeof Person.v1.get>;
   private readonly getPersonWithLineage: ReturnType<typeof Person.v1.getWithLineage>;
   constructor(
-    private userSettingsService: UserSettingsService,
+    private readonly userSettingsService: UserSettingsService,
+    private readonly authService: AuthService,
     chtDatasourceService: CHTDatasourceService,
   ) {
     this.getPerson = chtDatasourceService.bind(Person.v1.get);
@@ -28,6 +30,20 @@ export class UserContactService {
     return getPerson(Qualifier.byUuid(user.contact_id));
   }
 
+  async getUserLineageToRemove(): Promise<string | null> {
+    if (this.authService.online(true)) {
+      return null;
+    }
+
+    const { facility_id }:any = await this.getUserSettings();
+    if (!facility_id || (Array.isArray(facility_id) && facility_id.length > 1)) {
+      return null;
+    }
+
+    const user = await this.get();
+    return user?.parent?.name as string;
+  }
+
   private getUserSettings = async () => {
     try {
       return await this.userSettingsService.get();
diff --git a/webapp/src/ts/training-card.guard.provider.ts b/webapp/src/ts/training-card.guard.provider.ts
index 5c5f1ad2ad8..edd612acd5e 100644
--- a/webapp/src/ts/training-card.guard.provider.ts
+++ b/webapp/src/ts/training-card.guard.provider.ts
@@ -10,7 +10,7 @@ import { Selectors } from '@mm-selectors/index';
   providedIn: 'root'
 })
 export class TrainingCardDeactivationGuardProvider implements CanDeactivate<any> {
-  private readonly globalActions;
+  private readonly globalActions: GlobalActions;
 
   constructor(private readonly store: Store) {
     this.globalActions = new GlobalActions(this.store);
diff --git a/webapp/tests/karma/ts/components/sidebar-menu/sidebar-menu.component.spec.ts b/webapp/tests/karma/ts/components/sidebar-menu/sidebar-menu.component.spec.ts
index 7951f75f9e1..ce7db203d4b 100644
--- a/webapp/tests/karma/ts/components/sidebar-menu/sidebar-menu.component.spec.ts
+++ b/webapp/tests/karma/ts/components/sidebar-menu/sidebar-menu.component.spec.ts
@@ -109,6 +109,12 @@ describe('SidebarMenuComponent', () => {
     ]);
 
     expect(component.secondaryOptions).excluding('click').have.deep.members([
+      {
+        routerLink: 'trainings',
+        icon: 'fa-graduation-cap',
+        translationKey: 'training_materials.page.title',
+        canDisplay: true,
+      },
       {
         routerLink: 'about',
         icon: 'fa-question',
diff --git a/webapp/tests/karma/ts/components/training-cards-form/training-cards-form.component.spec.ts b/webapp/tests/karma/ts/components/training-cards-form/training-cards-form.component.spec.ts
new file mode 100644
index 00000000000..fd0b192a47a
--- /dev/null
+++ b/webapp/tests/karma/ts/components/training-cards-form/training-cards-form.component.spec.ts
@@ -0,0 +1,351 @@
+import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { expect } from 'chai';
+import sinon from 'sinon';
+
+import { GeolocationService } from '@mm-services/geolocation.service';
+import { XmlFormsService } from '@mm-services/xml-forms.service';
+import { FormService } from '@mm-services/form.service';
+import { TranslateService } from '@mm-services/translate.service';
+import { Selectors } from '@mm-selectors/index';
+import { GlobalActions } from '@mm-actions/global';
+import { PerformanceService } from '@mm-services/performance.service';
+import { FeedbackService } from '@mm-services/feedback.service';
+import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
+import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';
+import { EnketoComponent } from '@mm-components/enketo/enketo.component';
+import { TrainingCardsFormComponent } from '@mm-components/training-cards-form/training-cards-form.component';
+
+describe('TrainingCardsFormComponent', () => {
+  let fixture: ComponentFixture<TrainingCardsFormComponent>;
+  let component: TrainingCardsFormComponent;
+  let store: MockStore;
+  let geolocationService;
+  let geoHandle;
+  let xmlFormsService;
+  let translateService;
+  let formService;
+  let globalActions;
+  let feedbackService;
+  let consoleErrorMock;
+  let performanceService;
+  let stopPerformanceTrackStub;
+
+  beforeEach(() => {
+    consoleErrorMock = sinon.stub(console, 'error');
+    geoHandle = { cancel: sinon.stub() };
+    geolocationService = { init: sinon.stub().returns(geoHandle) };
+    xmlFormsService = { get: sinon.stub().resolves() };
+    translateService = {
+      get: sinon.stub().resolvesArg(0),
+      instant: sinon.stub().returnsArg(0),
+    };
+    formService = {
+      unload: sinon.stub(),
+      save: sinon.stub(),
+      render: sinon.stub().resolves(),
+    };
+    feedbackService = { submit: sinon.stub() };
+    const mockedSelectors = [
+      { selector: Selectors.getEnketoStatus, value: {} },
+      { selector: Selectors.getEnketoSavingStatus, value: false },
+      { selector: Selectors.getEnketoError, value: false },
+      { selector: Selectors.getTrainingCardFormId, value: null },
+      { selector: Selectors.getTrainingCard, value: {} },
+    ];
+    globalActions = {
+      clearEnketoStatus: sinon.stub(GlobalActions.prototype, 'clearEnketoStatus'),
+      setEnketoSavingStatus: sinon.stub(GlobalActions.prototype, 'setEnketoSavingStatus'),
+      setEnketoError: sinon.stub(GlobalActions.prototype, 'setEnketoError'),
+      setSnackbarContent: sinon.stub(GlobalActions.prototype, 'setSnackbarContent'),
+      setTrainingCard: sinon.stub(GlobalActions.prototype, 'setTrainingCard'),
+    };
+    stopPerformanceTrackStub = sinon.stub();
+    performanceService = { track: sinon.stub().returns({ stop: stopPerformanceTrackStub }) };
+
+    return TestBed
+      .configureTestingModule({
+        imports: [
+          TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
+        ],
+        declarations: [
+          TrainingCardsFormComponent,
+          ModalLayoutComponent,
+          PanelHeaderComponent,
+          EnketoComponent,
+        ],
+        providers: [
+          provideMockStore({ selectors: mockedSelectors }),
+          { provide: GeolocationService, useValue: geolocationService },
+          { provide: XmlFormsService, useValue: xmlFormsService },
+          { provide: TranslateService, useValue: translateService },
+          { provide: FormService, useValue: formService },
+          { provide: PerformanceService, useValue: performanceService },
+          { provide: FeedbackService, useValue: feedbackService },
+        ],
+      })
+      .compileComponents()
+      .then(() => {
+        fixture = TestBed.createComponent(TrainingCardsFormComponent);
+        store = TestBed.inject(MockStore);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+      });
+  });
+
+  afterEach(() => sinon.restore());
+
+  it('should create component', () => {
+    expect(component).to.exist;
+  });
+
+  it('should unsubscribe from everything, cancel geohandle and clear enketo form', fakeAsync(() => {
+    const unsubscribeStub = sinon.stub(component.subscriptions, 'unsubscribe');
+
+    store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+    store.refreshState();
+    tick();
+    sinon.resetHistory();
+    component.ngOnDestroy();
+    tick();
+
+    expect(unsubscribeStub.calledOnce).to.be.true;
+    expect(geoHandle.cancel.calledOnce).to.be.true;
+    expect(formService.unload.calledOnce).to.be.true;
+    expect(globalActions.clearEnketoStatus.calledOnce).to.be.true;
+  }));
+
+  describe('onInit', () => {
+    it('should subscribe to redux and init component', fakeAsync(() => {
+      const AddSpy = sinon.spy(component.subscriptions, 'add');
+      sinon.resetHistory();
+
+      component.ngOnInit();
+
+      expect(AddSpy.calledOnce).to.be.true;
+      expect(component.contentError).to.be.false;
+      expect(component.enketoError).to.be.false;
+      expect(component.trainingCardFormId).to.be.null;
+      expect(component.form).to.be.null;
+      expect(component.loadingContent).to.be.true;
+
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'form-123');
+      store.overrideSelector(
+        Selectors.getEnketoStatus,
+        { form: true, edited: false, saving: true, error: 'ups an error' },
+      );
+      store.overrideSelector(Selectors.getEnketoSavingStatus, true);
+      store.overrideSelector(Selectors.getEnketoError, 'ups an error');
+      store.refreshState();
+
+      flush();
+
+      expect(component.enketoError).to.equal('ups an error');
+      expect(component.trainingCardFormId).to.equal('form-123');
+      expect(component.enketoStatus).to.deep.equal({ form: true, edited: false, saving: true, error: 'ups an error' });
+      expect(component.enketoSaving).to.be.true;
+    }));
+
+    it('should reset component', () => {
+      component.contentError = true;
+      component.trainingCardFormId = 'training:a_form_id';
+      component.form = { the: 'rendered training form' };
+      component.loadingContent = false;
+      component.enketoError = 'some_error';
+      sinon.resetHistory();
+
+      component.ngOnInit();
+
+      expect(globalActions.setEnketoError.calledOnce).to.be.true;
+      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ null ]);
+      expect(component.contentError).to.be.false;
+      expect(component.trainingCardFormId).to.be.null;
+      expect(component.form).to.be.null;
+      expect(component.loadingContent).to.be.true;
+    });
+  });
+
+  describe('saveForm', () => {
+    it('should do nothing if already saving', fakeAsync(() => {
+      const consoleDebugMock = sinon.stub(console, 'debug');
+      component.enketoSaving = true;
+
+      component.saveForm();
+      tick();
+
+      expect(consoleDebugMock.calledOnce).to.be.true;
+      expect(consoleDebugMock.args[0]).to.deep.equal([
+        'Attempted to call TrainingCardsFormComponent:saveForm more than once'
+      ]);
+      expect(formService.save.notCalled).to.be.true;
+      expect(formService.unload.notCalled).to.be.true;
+      expect(globalActions.setEnketoSavingStatus.notCalled).to.be.true;
+      expect(globalActions.setSnackbarContent.notCalled).to.be.true;
+      expect(globalActions.setEnketoError.notCalled).to.be.true;
+    }));
+
+    it('should call enketo save, set content in snackbar and unload form', fakeAsync(() => {
+      const consoleDebugMock = sinon.stub(console, 'debug');
+      xmlFormsService.get.resolves({ _id: 'form:training:new_feature' });
+      formService.save.resolves([{ _id: 'completed_training' }]);
+      formService.render.resolves({
+        _id: 'form:training:new_feature',
+        pages: { activePages: [ { id: 'page-1' } ] },
+      });
+
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+      component.saveForm();
+      tick();
+
+      expect(formService.unload.calledOnce).to.be.true;
+      expect(formService.unload.args[0]).to.deep.equal([{
+        _id: 'form:training:new_feature',
+        pages: { activePages: [ { id: 'page-1' } ] },
+      }]);
+      expect(formService.save.calledOnce).to.be.true;
+      expect(formService.save.args[0]).to.deep.equal([
+        'training:a_form_id',
+        {
+          _id: 'form:training:new_feature',
+          pages: { activePages: [ { id: 'page-1' } ] },
+        },
+        geoHandle
+      ]);
+      expect(consoleDebugMock.callCount).to.equal(1);
+      expect(consoleDebugMock.args[0]).to.deep.equal([
+        'Saved form and associated docs',
+        [{ _id: 'completed_training' }]
+      ]);
+      expect(globalActions.setEnketoSavingStatus.calledTwice).to.be.true;
+      expect(globalActions.setEnketoSavingStatus.args).to.deep.equal([[ true ], [ false ]]);
+      expect(globalActions.setSnackbarContent.calledOnce).to.be.true;
+      expect(globalActions.setSnackbarContent.args[0]).to.deep.equal([ 'training_cards.form.saved' ]);
+      expect(stopPerformanceTrackStub.callCount).to.equal(3);
+      expect(stopPerformanceTrackStub.args[0][0])
+        .to.deep.equal({ name: 'enketo:training:a_form_id:add:render', recordApdex: true });
+      expect(stopPerformanceTrackStub.args[1][0])
+        .to.deep.equal({ name: 'enketo:training:a_form_id:add:user_edit_time' });
+      expect(stopPerformanceTrackStub.args[2][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:save' });
+      expect(globalActions.setEnketoError.notCalled).to.be.true;
+    }));
+
+    it('should catch enketo saving error', fakeAsync(() => {
+      sinon.resetHistory();
+      xmlFormsService.get.resolves({ the: 'rendered training form' });
+      formService.render.resolves({ the: 'rendered training form' });
+      formService.save.rejects({ some: 'error' });
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+
+      component.saveForm();
+      tick();
+
+      expect(formService.save.calledOnce).to.be.true;
+      expect(formService.save.args[0]).to.deep.equal([
+        'training:a_form_id',
+        { the: 'rendered training form' },
+        geoHandle
+      ]);
+      expect(consoleErrorMock.calledOnce).to.be.true;
+      expect(consoleErrorMock.args[0]).to.deep.equal([
+        'TrainingCardsFormComponent :: Error submitting form data.',
+        { some: 'error' }
+      ]);
+      expect(globalActions.setEnketoError.calledOnce).to.be.true;
+      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ 'training_cards.error.save' ]);
+      expect(globalActions.setEnketoSavingStatus.calledTwice).to.be.true;
+      expect(globalActions.setEnketoSavingStatus.args).to.deep.equal([[ true ], [ false ]]);
+      expect(globalActions.setSnackbarContent.notCalled).to.be.true;
+    }));
+  });
+
+  describe('loadForm', () => {
+    it('should load form', fakeAsync(() => {
+      sinon.resetHistory();
+      const xmlForm = { _id: 'training:a_form_id', some: 'content' };
+      const renderedForm = { rendered: 'form', model: {}, instance: {} };
+      xmlFormsService.get.resolves(xmlForm);
+      formService.render.resolves(renderedForm);
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+
+      expect(geolocationService.init.calledOnce).to.be.true;
+      expect(xmlFormsService.get.calledOnce).to.be.true;
+      expect(xmlFormsService.get.args[0]).to.deep.equal([ 'training:a_form_id' ]);
+      expect(formService.render.calledOnce).to.be.true;
+      expect(formService.render.args[0][0].formDoc).to.deep.equal(xmlForm);
+      expect(component.form).to.equal(renderedForm);
+      expect(consoleErrorMock.notCalled).to.be.true;
+      expect(feedbackService.submit.notCalled).to.be.true;
+      expect(stopPerformanceTrackStub.calledOnce).to.be.true;
+      expect(stopPerformanceTrackStub.args[0][0])
+        .to.deep.equal({ name: 'enketo:training:a_form_id:add:render', recordApdex: true });
+
+      const resetFormError = formService.render.args[0][0].valuechangeListener;
+      resetFormError();
+      expect(globalActions.setEnketoError.notCalled).to.be.true; // No error so no call
+      component.enketoError = 'some error';
+      resetFormError();
+      expect(globalActions.setEnketoError.calledOnce).to.be.true;
+      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ null ]);
+    }));
+
+    it('should reset geohandle on reload', fakeAsync(() => {
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+
+      expect(geoHandle.cancel.notCalled).to.be.true;
+      expect(geolocationService.init.calledOnce).to.be.true;
+
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:another_form_id');
+      store.refreshState();
+      tick();
+
+      expect(geolocationService.init.calledTwice).to.be.true;
+      expect(geoHandle.cancel.calledOnce).to.be.true;
+    }));
+
+    it('should catch form loading errors', fakeAsync(() => {
+      xmlFormsService.get.rejects({ error: 'boom' });
+      sinon.resetHistory();
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+
+      expect(xmlFormsService.get.calledOnce).to.be.true;
+      expect(formService.render.notCalled).to.be.true;
+      expect(consoleErrorMock.calledOnce).to.be.true;
+      expect(consoleErrorMock.args[0]).to.deep.equal([
+        'TrainingCardsFormComponent :: Error fetching form.',
+        { error: 'boom' }
+      ]);
+      expect(component.errorTranslationKey).to.equal('training_cards.error.loading');
+      expect(component.loadingContent).to.be.false;
+      expect(component.contentError).to.be.true;
+    }));
+
+    it('should catch enketo errors', fakeAsync(() => {
+      xmlFormsService.get.resolves({ _id: 'training:a_form_id', some: 'content' });
+      formService.render.rejects({ some: 'error' });
+      sinon.resetHistory();
+      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
+      store.refreshState();
+      tick();
+
+      expect(xmlFormsService.get.calledOnce).to.be.true;
+      expect(formService.render.calledOnce).to.be.true;
+      expect(component.form).to.equal(null);
+      expect(consoleErrorMock.calledOnce).to.be.true;
+      expect(consoleErrorMock.args[0]).to.deep.equal([
+        'TrainingCardsFormComponent :: Error rendering form.',
+        { some: 'error' }
+      ]);
+    }));
+  });
+});
diff --git a/webapp/tests/karma/ts/modals/training-cards/training-cards.component.spec.ts b/webapp/tests/karma/ts/modals/training-cards/training-cards.component.spec.ts
index b00309fa782..794c80d9f2f 100644
--- a/webapp/tests/karma/ts/modals/training-cards/training-cards.component.spec.ts
+++ b/webapp/tests/karma/ts/modals/training-cards/training-cards.component.spec.ts
@@ -1,76 +1,46 @@
 import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { ComponentFixture, fakeAsync, flush, TestBed } from '@angular/core/testing';
+import { provideMockStore } from '@ngrx/store/testing';
 import { Router } from '@angular/router';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogRef } from '@angular/material/dialog';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
 import { TrainingCardsComponent } from '@mm-modals/training-cards/training-cards.component';
-import { GeolocationService } from '@mm-services/geolocation.service';
-import { XmlFormsService } from '@mm-services/xml-forms.service';
-import { FormService } from '@mm-services/form.service';
-import { TranslateService } from '@mm-services/translate.service';
-import { Selectors } from '@mm-selectors/index';
 import { GlobalActions } from '@mm-actions/global';
 import { PerformanceService } from '@mm-services/performance.service';
-import { FeedbackService } from '@mm-services/feedback.service';
 import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
-import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';
+import { TrainingCardsFormComponent } from '@mm-components/training-cards-form/training-cards-form.component';
+import { XmlFormsService } from '@mm-services/xml-forms.service';
+import { FormService } from '@mm-services/form.service';
+import { GeolocationService } from '@mm-services/geolocation.service';
 import { EnketoComponent } from '@mm-components/enketo/enketo.component';
+import { Selectors } from '@mm-selectors/index';
 
 describe('TrainingCardsComponent', () => {
   let fixture: ComponentFixture<TrainingCardsComponent>;
   let component: TrainingCardsComponent;
-  let store: MockStore;
-  let geolocationService;
-  let geoHandle;
-  let xmlFormsService;
   let matDialogRef;
-  let translateService;
-  let formService;
   let globalActions;
-  let feedbackService;
-  let consoleErrorMock;
   let performanceService;
   let stopPerformanceTrackStub;
   let routerMock;
 
   beforeEach(() => {
-    consoleErrorMock = sinon.stub(console, 'error');
-    geoHandle = { cancel: sinon.stub() };
-    geolocationService = { init: sinon.stub().returns(geoHandle) };
-    xmlFormsService = { get: sinon.stub().resolves() };
     matDialogRef = { close: sinon.stub() };
-    translateService = {
-      get: sinon.stub().resolvesArg(0),
-      instant: sinon.stub().returnsArg(0),
-    };
-    formService = {
-      unload: sinon.stub(),
-      save: sinon.stub(),
-      render: sinon.stub().resolves(),
-    };
     routerMock = {
       navigateByUrl: sinon.stub(),
     };
-    feedbackService = { submit: sinon.stub() };
-    const mockedSelectors = [
-      { selector: Selectors.getEnketoStatus, value: {} },
-      { selector: Selectors.getEnketoSavingStatus, value: false },
-      { selector: Selectors.getEnketoError, value: false },
-      { selector: Selectors.getTrainingCardFormId, value: null },
-      { selector: Selectors.getTrainingCard, value: {} },
-    ];
     globalActions = {
-      clearEnketoStatus: sinon.stub(GlobalActions.prototype, 'clearEnketoStatus'),
-      setEnketoSavingStatus: sinon.stub(GlobalActions.prototype, 'setEnketoSavingStatus'),
-      setEnketoError: sinon.stub(GlobalActions.prototype, 'setEnketoError'),
-      setSnackbarContent: sinon.stub(GlobalActions.prototype, 'setSnackbarContent'),
+      clearTrainingCards: sinon.stub(GlobalActions.prototype, 'clearTrainingCards'),
       setTrainingCard: sinon.stub(GlobalActions.prototype, 'setTrainingCard'),
     };
     stopPerformanceTrackStub = sinon.stub();
     performanceService = { track: sinon.stub().returns({ stop: stopPerformanceTrackStub }) };
+    const mockedSelectors = [
+      { selector: Selectors.getTrainingCard, value: null },
+      { selector: Selectors.getTrainingCardFormId, value: null },
+    ];
 
     return TestBed
       .configureTestingModule({
@@ -80,351 +50,83 @@ describe('TrainingCardsComponent', () => {
         declarations: [
           TrainingCardsComponent,
           ModalLayoutComponent,
-          PanelHeaderComponent,
+          TrainingCardsFormComponent,
           EnketoComponent,
         ],
         providers: [
           provideMockStore({ selectors: mockedSelectors }),
-          { provide: GeolocationService, useValue: geolocationService },
-          { provide: XmlFormsService, useValue: xmlFormsService },
-          { provide: TranslateService, useValue: translateService },
-          { provide: FormService, useValue: formService },
           { provide: PerformanceService, useValue: performanceService },
-          { provide: FeedbackService, useValue: feedbackService },
           { provide: MatDialogRef, useValue: matDialogRef },
           { provide: Router, useValue: routerMock },
-          { provide: MAT_DIALOG_DATA, useValue: {} },
+          { provide: XmlFormsService, useValue: {} },
+          { provide: FormService, useValue: { unload: sinon.stub() } },
+          { provide: GeolocationService, useValue: {} },
         ],
       })
       .compileComponents()
       .then(() => {
         fixture = TestBed.createComponent(TrainingCardsComponent);
-        store = TestBed.inject(MockStore);
         component = fixture.componentInstance;
         fixture.detectChanges();
+        sinon.resetHistory();
       });
   });
 
   afterEach(() => sinon.restore());
 
-  it('should create component', () => {
+  it('should create component', fakeAsync(() => {
     expect(component).to.exist;
-  });
 
-  it('should close modal', () => {
-    component.close();
+    component.ngOnInit();
+    flush();
 
-    expect(matDialogRef.close.calledOnce).to.be.true;
-  });
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
+    expect(globalActions.setTrainingCard.args[0][0]).to.deep.equal({ isOpen: true });
+  }));
 
-  it('should unsubscribe from everything, cancel geohandle and clear enketo form', fakeAsync(() => {
-    const unsubscribeStub = sinon.stub(component.subscription, 'unsubscribe');
+  it('should unsubscribe from store and clear training cards state', () => {
+    const unsubscribeStub = sinon.stub(component.subscriptions, 'unsubscribe');
 
-    store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-    store.refreshState();
-    tick();
-    sinon.resetHistory();
     component.ngOnDestroy();
-    tick();
 
     expect(unsubscribeStub.calledOnce).to.be.true;
-    expect(geoHandle.cancel.calledOnce).to.be.true;
-    expect(formService.unload.calledOnce).to.be.true;
-    expect(globalActions.clearEnketoStatus.calledOnce).to.be.true;
-  }));
-
-  it('should close modal when quiting training', fakeAsync(() => {
-    sinon.resetHistory();
-    const xmlForm = { _id: 'training:a_form_id', some: 'content' };
-    const renderedForm = { rendered: 'form', model: {}, instance: {} };
-    xmlFormsService.get.resolves(xmlForm);
-    formService.render.resolves(renderedForm);
-    store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-    store.overrideSelector(
-      Selectors.getTrainingCard,
-      { formId: '', isOpen: false, showConfirmExit: false, nextUrl: '' }
-    );
-    store.refreshState();
-    tick();
-
-    component.quitTraining();
-
-    expect(matDialogRef.close.calledOnce).to.be.true;
-    expect(geolocationService.init.calledOnce).to.be.true;
-    expect(xmlFormsService.get.calledOnce).to.be.true;
-    expect(xmlFormsService.get.args[0]).to.deep.equal([ 'training:a_form_id' ]);
-    expect(formService.render.calledOnce).to.be.true;
-    expect(formService.render.args[0][0].formDoc).to.deep.equal(xmlForm);
-    expect(component.form).to.equal(renderedForm);
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
-    expect(stopPerformanceTrackStub.callCount).to.equal(2);
-    expect(stopPerformanceTrackStub.args[0][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:render' });
-    expect(stopPerformanceTrackStub.args[1][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:quit' });
-    expect(globalActions.setTrainingCard.args[0]).to.deep.equal([{
-      formId: null,
-      isOpen: false,
-      showConfirmExit: false,
-      nextUrl: null,
-    }]);
-  }));
-
-  it('should get training card state from store', fakeAsync(() => {
-    sinon.resetHistory();
-    store.overrideSelector(
-      Selectors.getTrainingCard,
-      { formId: '', isOpen: true, showConfirmExit: true, nextUrl: '/next/page' }
-    );
-    store.refreshState();
-    tick();
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
+  });
 
-    component.ngOnInit();
+  it('should set training cards state when not quitting the training', () => {
+    component.continueTraining();
 
     expect(globalActions.setTrainingCard.calledOnce).to.be.true;
-    expect(globalActions.setTrainingCard.args[0][0]).to.deep.equal({ isOpen: true });
-    expect(component.showConfirmExit).to.be.true;
-    expect(component.nextUrl).to.equal('/next/page');
-  }));
+    expect(globalActions.setTrainingCard.args[0][0]).to.deep.equal({ showConfirmExit: false });
+  });
 
-  it('should navigate to nextUrl if present', () => {
-    sinon.resetHistory();
-    component.nextUrl = '/next/page';
-    component.quitTraining();
+  it('should exit training and navigate to nextUrl if present', () => {
+    const nextUrl = '/next/page';
 
+    component.exitTraining(nextUrl);
+
+    expect(stopPerformanceTrackStub.calledOnce).to.be.true;
     expect(matDialogRef.close.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
     expect(routerMock.navigateByUrl.calledOnce).to.be.true;
-    expect(routerMock.navigateByUrl.args[0]).to.have.deep.members(['/next/page']);
+    expect(routerMock.navigateByUrl.args[0][0]).to.equal(nextUrl);
   });
 
-  it('should not navigate to nextUrl if not present', () => {
-    sinon.resetHistory();
-    component.nextUrl = null;
-    component.quitTraining();
+  it('should exit training and not navigate to nextUrl if not present', () => {
+    component.exitTraining('');
 
+    expect(stopPerformanceTrackStub.calledOnce).to.be.true;
     expect(matDialogRef.close.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
     expect(routerMock.navigateByUrl.notCalled).to.be.true;
   });
 
-  describe('onInit', () => {
-    it('should subscribe to redux and init component', () => {
-      const AddSpy = sinon.spy(component.subscription, 'add');
-      sinon.resetHistory();
-
-      component.ngOnInit();
-
-      expect(AddSpy.calledOnce).to.be.true;
-      expect(component.contentError).to.be.false;
-      expect(component.trainingCardFormId).to.be.null;
-      expect(component.form).to.be.null;
-      expect(component.loadingContent).to.be.true;
-      expect(component.hideModalFooter).to.be.true;
-      expect(component.nextUrl).to.be.undefined;
-      expect(component.showConfirmExit).to.be.undefined;
-    });
-
-    it('should reset component', () => {
-      component.contentError = true;
-      component.trainingCardFormId = 'training:a_form_id';
-      component.form = { the: 'rendered training form' };
-      component.loadingContent = false;
-      component.hideModalFooter = false;
-      component.enketoError = 'some_error';
-      sinon.resetHistory();
-
-      component.ngOnInit();
-
-      expect(globalActions.setEnketoError.calledOnce).to.be.true;
-      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ null ]);
-      expect(component.contentError).to.be.false;
-      expect(component.trainingCardFormId).to.be.null;
-      expect(component.form).to.be.null;
-      expect(component.loadingContent).to.be.true;
-      expect(component.hideModalFooter).to.be.true;
-    });
-  });
-
-  describe('saveForm', () => {
-    it('should do nothing if already saving', fakeAsync(() => {
-      const consoleDebugMock = sinon.stub(console, 'debug');
-      component.enketoSaving = true;
-
-      component.saveForm();
-      tick();
-
-      expect(consoleDebugMock.calledOnce).to.be.true;
-      expect(consoleDebugMock.args[0]).to.deep.equal([
-        'Attempted to call TrainingCardsComponent:saveForm more than once'
-      ]);
-      expect(formService.save.notCalled).to.be.true;
-      expect(formService.unload.notCalled).to.be.true;
-      expect(globalActions.setEnketoSavingStatus.notCalled).to.be.true;
-      expect(globalActions.setSnackbarContent.notCalled).to.be.true;
-      expect(globalActions.setEnketoError.notCalled).to.be.true;
-      expect(matDialogRef.close.notCalled).to.be.true;
-    }));
-
-    it('should call enketo save, set content in snackbar and unload form', fakeAsync(() => {
-      const consoleDebugMock = sinon.stub(console, 'debug');
-      xmlFormsService.get.resolves({ _id: 'form:training:new_feature' });
-      formService.save.resolves([{ _id: 'completed_training' }]);
-      formService.render.resolves({
-        _id: 'form:training:new_feature',
-        pages: { activePages: [ { id: 'page-1' } ] },
-      });
-
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-      component.saveForm();
-      tick();
-
-      expect(formService.unload.calledOnce).to.be.true;
-      expect(formService.unload.args[0]).to.deep.equal([{
-        _id: 'form:training:new_feature',
-        pages: { activePages: [ { id: 'page-1' } ] },
-      }]);
-      expect(formService.save.calledOnce).to.be.true;
-      expect(formService.save.args[0]).to.deep.equal([
-        'training:a_form_id',
-        {
-          _id: 'form:training:new_feature',
-          pages: { activePages: [ { id: 'page-1' } ] },
-        },
-        geoHandle
-      ]);
-      expect(consoleDebugMock.callCount).to.equal(1);
-      expect(consoleDebugMock.args[0]).to.deep.equal([
-        'Saved form and associated docs',
-        [{ _id: 'completed_training' }]
-      ]);
-      expect(globalActions.setEnketoSavingStatus.calledTwice).to.be.true;
-      expect(globalActions.setEnketoSavingStatus.args).to.deep.equal([[ true ], [ false ]]);
-      expect(globalActions.setSnackbarContent.calledOnce).to.be.true;
-      expect(globalActions.setSnackbarContent.args[0]).to.deep.equal([ 'training_cards.form.saved' ]);
-      expect(stopPerformanceTrackStub.callCount).to.equal(3);
-      expect(stopPerformanceTrackStub.args[0][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:render' });
-      expect(stopPerformanceTrackStub.args[1][0])
-        .to.deep.equal({ name: 'enketo:training:a_form_id:add:user_edit_time' });
-      expect(stopPerformanceTrackStub.args[2][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:save' });
-      expect(globalActions.setEnketoError.notCalled).to.be.true;
-      expect(matDialogRef.close.calledOnce).to.be.true;
-    }));
-
-    it('should catch enketo saving error', fakeAsync(() => {
-      sinon.resetHistory();
-      xmlFormsService.get.resolves({ the: 'rendered training form' });
-      formService.render.resolves({ the: 'rendered training form' });
-      formService.save.rejects({ some: 'error' });
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-
-      component.saveForm();
-      tick();
+  it('should close training cards', () => {
+    component.close();
 
-      expect(formService.save.calledOnce).to.be.true;
-      expect(formService.save.args[0]).to.deep.equal([
-        'training:a_form_id',
-        { the: 'rendered training form' },
-        geoHandle
-      ]);
-      expect(consoleErrorMock.calledOnce).to.be.true;
-      expect(consoleErrorMock.args[0]).to.deep.equal([
-        'Training Cards :: Error submitting form data.',
-        { some: 'error' }
-      ]);
-      expect(globalActions.setEnketoError.calledOnce).to.be.true;
-      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ 'training_cards.error.save' ]);
-      expect(globalActions.setEnketoSavingStatus.calledTwice).to.be.true;
-      expect(globalActions.setEnketoSavingStatus.args).to.deep.equal([[ true ], [ false ]]);
-      expect(matDialogRef.close.notCalled).to.be.true;
-      expect(globalActions.setSnackbarContent.notCalled).to.be.true;
-    }));
+    expect(matDialogRef.close.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
   });
 
-  describe('loadForm', () => {
-    it('should load form', fakeAsync(() => {
-      sinon.resetHistory();
-      const xmlForm = { _id: 'training:a_form_id', some: 'content' };
-      const renderedForm = { rendered: 'form', model: {}, instance: {} };
-      xmlFormsService.get.resolves(xmlForm);
-      formService.render.resolves(renderedForm);
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-
-      expect(geolocationService.init.calledOnce).to.be.true;
-      expect(xmlFormsService.get.calledOnce).to.be.true;
-      expect(xmlFormsService.get.args[0]).to.deep.equal([ 'training:a_form_id' ]);
-      expect(formService.render.calledOnce).to.be.true;
-      expect(formService.render.args[0][0].formDoc).to.deep.equal(xmlForm);
-      expect(component.form).to.equal(renderedForm);
-      expect(consoleErrorMock.notCalled).to.be.true;
-      expect(feedbackService.submit.notCalled).to.be.true;
-      expect(stopPerformanceTrackStub.calledOnce).to.be.true;
-      expect(stopPerformanceTrackStub.args[0][0]).to.deep.equal({ name: 'enketo:training:a_form_id:add:render' });
-
-      const resetFormError = formService.render.args[0][0].valuechangeListener;
-      resetFormError();
-      expect(globalActions.setEnketoError.notCalled).to.be.true; // No error so no call
-      component.enketoError = 'some error';
-      resetFormError();
-      expect(globalActions.setEnketoError.calledOnce).to.be.true;
-      expect(globalActions.setEnketoError.args[0]).to.deep.equal([ null ]);
-    }));
-
-    it('should reset geohandle on reload', fakeAsync(() => {
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-
-      expect(geoHandle.cancel.notCalled).to.be.true;
-      expect(geolocationService.init.calledOnce).to.be.true;
-
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:another_form_id');
-      store.refreshState();
-      tick();
-
-      expect(geolocationService.init.calledTwice).to.be.true;
-      expect(geoHandle.cancel.calledOnce).to.be.true;
-    }));
-
-    it('should catch form loading errors', fakeAsync(() => {
-      xmlFormsService.get.rejects({ error: 'boom' });
-      sinon.resetHistory();
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-
-      expect(xmlFormsService.get.calledOnce).to.be.true;
-      expect(formService.render.notCalled).to.be.true;
-      expect(consoleErrorMock.calledOnce).to.be.true;
-      expect(consoleErrorMock.args[0]).to.deep.equal([
-        'Training Cards :: Error fetching form.',
-        { error: 'boom' }
-      ]);
-      expect(component.errorTranslationKey).to.equal('training_cards.error.loading');
-      expect(component.loadingContent).to.be.false;
-      expect(component.hideModalFooter).to.be.false;
-      expect(component.contentError).to.be.true;
-    }));
-
-    it('should catch enketo errors', fakeAsync(() => {
-      xmlFormsService.get.resolves({ _id: 'training:a_form_id', some: 'content' });
-      formService.render.rejects({ some: 'error' });
-      sinon.resetHistory();
-      store.overrideSelector(Selectors.getTrainingCardFormId, 'training:a_form_id');
-      store.refreshState();
-      tick();
-
-      expect(xmlFormsService.get.calledOnce).to.be.true;
-      expect(formService.render.calledOnce).to.be.true;
-      expect(component.form).to.equal(null);
-      expect(consoleErrorMock.calledOnce).to.be.true;
-      expect(consoleErrorMock.args[0]).to.deep.equal([
-        'Training Cards :: Error rendering form.',
-        { some: 'error' }
-      ]);
-    }));
-  });
 });
+
diff --git a/webapp/tests/karma/ts/modules/messages/messages.component.spec.ts b/webapp/tests/karma/ts/modules/messages/messages.component.spec.ts
index 19b4f39286c..a619bbceed2 100644
--- a/webapp/tests/karma/ts/modules/messages/messages.component.spec.ts
+++ b/webapp/tests/karma/ts/modules/messages/messages.component.spec.ts
@@ -16,7 +16,6 @@ import { SettingsService } from '@mm-services/settings.service';
 import { ModalService } from '@mm-services/modal.service';
 import { NavigationComponent } from '@mm-components/navigation/navigation.component';
 import { NavigationService } from '@mm-services/navigation.service';
-import { ExtractLineageService } from '@mm-services/extract-lineage.service';
 import { FastActionButtonService } from '@mm-services/fast-action-button.service';
 import { SendMessageComponent } from '@mm-modals/send-message/send-message.component';
 import { MessagesMoreMenuComponent } from '@mm-modules/messages/messages-more-menu.component';
@@ -26,6 +25,7 @@ import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
 import { PerformanceService } from '@mm-services/performance.service';
 import { ExportService } from '@mm-services/export.service';
 import { AuthService } from '@mm-services/auth.service';
+import { UserContactService } from '@mm-services/user-contact.service';
 
 describe('Messages Component', () => {
   let component: MessagesComponent;
@@ -37,7 +37,7 @@ describe('Messages Component', () => {
   let authService;
   let sessionService;
   let performanceService;
-  let extractLineageService;
+  let userContactService;
   let stopPerformanceTrackStub;
 
   beforeEach(waitForAsync(() => {
@@ -59,9 +59,8 @@ describe('Messages Component', () => {
       has: sinon.stub()
     };
     sessionService = { isAdmin: sinon.stub() };
-    extractLineageService = {
+    userContactService = {
       getUserLineageToRemove: sinon.stub(),
-      removeUserFacility: ExtractLineageService.prototype.removeUserFacility,
     };
     const mockedSelectors = [
       { selector: 'getSelectedConversation', value: {} },
@@ -96,7 +95,7 @@ describe('Messages Component', () => {
           { provide: AuthService, useValue: authService },
           { provide: FastActionButtonService, useValue: fastActionButtonService },
           { provide: PerformanceService, useValue: performanceService },
-          { provide: ExtractLineageService, useValue: extractLineageService },
+          { provide: UserContactService, useValue: userContactService },
           { provide: MatBottomSheet, useValue: { open: sinon.stub() } },
           { provide: MatDialog, useValue: { open: sinon.stub() } },
         ]
@@ -262,7 +261,7 @@ describe('Messages Component', () => {
     ];
 
     it('it should retrieve the hierarchy level of the connected user', fakeAsync(async () => {
-      extractLineageService.getUserLineageToRemove.resolves('CHW Bettys Area');
+      userContactService.getUserLineageToRemove.resolves('CHW Bettys Area');
 
       component.ngOnInit();
       tick();
@@ -274,7 +273,7 @@ describe('Messages Component', () => {
       sinon.resetHistory();
 
       messageContactService.getList.resolves(conversations);
-      extractLineageService.getUserLineageToRemove.resolves(undefined);
+      userContactService.getUserLineageToRemove.resolves(undefined);
       component.ngOnInit();
       tick();
       component.updateConversations({ merge: true });
@@ -307,7 +306,7 @@ describe('Messages Component', () => {
         },
       ];
 
-      extractLineageService.getUserLineageToRemove.resolves('CHW Bettys Area');
+      userContactService.getUserLineageToRemove.resolves('CHW Bettys Area');
       messageContactService.getList.resolves(conversations);
       component.ngOnInit();
       tick();
diff --git a/webapp/tests/karma/ts/modules/reports/reports.component.spec.ts b/webapp/tests/karma/ts/modules/reports/reports.component.spec.ts
index 8dae1da483a..af5abc54288 100644
--- a/webapp/tests/karma/ts/modules/reports/reports.component.spec.ts
+++ b/webapp/tests/karma/ts/modules/reports/reports.component.spec.ts
@@ -37,7 +37,6 @@ import { FastActionButtonService } from '@mm-services/fast-action-button.service
 import { FeedbackService } from '@mm-services/feedback.service';
 import { XmlFormsService } from '@mm-services/xml-forms.service';
 import { ReportsMoreMenuComponent } from '@mm-modules/reports/reports-more-menu.component';
-import { ExtractLineageService } from '@mm-services/extract-lineage.service';
 
 describe('Reports Component', () => {
   let component: ReportsComponent;
@@ -56,7 +55,6 @@ describe('Reports Component', () => {
   let xmlFormsService;
   let feedbackService;
   let performanceService;
-  let extractLineageService;
   let stopPerformanceTrackStub;
   let store;
   let route;
@@ -108,6 +106,7 @@ describe('Reports Component', () => {
     modalService = { show: sinon.stub() };
     userContactService = {
       get: sinon.stub().resolves(userContactDoc),
+      getUserLineageToRemove: sinon.stub(),
     };
     fastActionButtonService = {
       getReportLeftSideActions: sinon.stub(),
@@ -115,10 +114,6 @@ describe('Reports Component', () => {
     };
     xmlFormsService = { subscribe: sinon.stub() };
     feedbackService = { submit: sinon.stub() };
-    extractLineageService = {
-      getUserLineageToRemove: sinon.stub(),
-      removeUserFacility: ExtractLineageService.prototype.removeUserFacility,
-    };
     route = { snapshot: { queryParams: { query: '' } } };
     router = {
       navigate: sinon.stub(),
@@ -169,7 +164,6 @@ describe('Reports Component', () => {
           { provide: FastActionButtonService, useValue: fastActionButtonService },
           { provide: FeedbackService, useValue: feedbackService },
           { provide: XmlFormsService, useValue: xmlFormsService },
-          { provide: ExtractLineageService, useValue: extractLineageService },
         ]
       })
       .compileComponents()
@@ -788,7 +782,7 @@ describe('Reports Component', () => {
 
     it('should not remove the lineage when user lineage level is undefined', fakeAsync(() => {
       sinon.resetHistory();
-      extractLineageService.getUserLineageToRemove.resolves(undefined);
+      userContactService.getUserLineageToRemove.resolves(undefined);
       const expectedReports = [
         {
           _id: '88b0dfff-4a82-4202-abea-d0cabe5aa9bd',
@@ -855,7 +849,7 @@ describe('Reports Component', () => {
     }));
 
     it('should remove lineage when user lineage level is defined', fakeAsync(() => {
-      extractLineageService.getUserLineageToRemove.resolves('CHW Bettys Area');
+      userContactService.getUserLineageToRemove.resolves('CHW Bettys Area');
       const expectedReports = [
         {
           _id: '88b0dfff-4a82-4202-abea-d0cabe5aa9bd',
diff --git a/webapp/tests/karma/ts/modules/tasks/tasks.component.spec.ts b/webapp/tests/karma/ts/modules/tasks/tasks.component.spec.ts
index 71ae9f73b03..2fda674f08a 100644
--- a/webapp/tests/karma/ts/modules/tasks/tasks.component.spec.ts
+++ b/webapp/tests/karma/ts/modules/tasks/tasks.component.spec.ts
@@ -18,7 +18,7 @@ import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
 import { Selectors } from '@mm-selectors/index';
 import { NavigationService } from '@mm-services/navigation.service';
 import { LineageModelGeneratorService } from '@mm-services/lineage-model-generator.service';
-import { ExtractLineageService } from '@mm-services/extract-lineage.service';
+import { UserContactService } from '@mm-services/user-contact.service';
 
 describe('TasksComponent', () => {
   let getComponent;
@@ -27,7 +27,7 @@ describe('TasksComponent', () => {
   let performanceService;
   let stopPerformanceTrackStub;
   let contactTypesService;
-  let extractLineageService;
+  let userContactService;
   let clock;
   let store;
   let lineageModelGeneratorService;
@@ -48,9 +48,8 @@ describe('TasksComponent', () => {
       includes: sinon.stub(),
     };
     lineageModelGeneratorService = { reportSubjects: sinon.stub().resolves([]) };
-    extractLineageService = {
+    userContactService = {
       getUserLineageToRemove: sinon.stub(),
-      removeUserFacility: ExtractLineageService.prototype.removeUserFacility,
     };
 
     TestBed.configureTestingModule({
@@ -66,7 +65,7 @@ describe('TasksComponent', () => {
         { provide: PerformanceService, useValue: performanceService },
         { provide: ContactTypesService, useValue: contactTypesService },
         { provide: NavigationService, useValue: {} },
-        { provide: ExtractLineageService, useValue: extractLineageService },
+        { provide: UserContactService, useValue: userContactService },
         { provide: LineageModelGeneratorService, useValue: lineageModelGeneratorService },
       ],
       declarations: [
@@ -342,7 +341,7 @@ describe('TasksComponent', () => {
           owner: 'b',
         },
       ];
-      extractLineageService.getUserLineageToRemove.resolves(undefined);
+      userContactService.getUserLineageToRemove.resolves(undefined);
       rulesEngineService.fetchTaskDocsForAllContacts.resolves(taskDocs);
       lineageModelGeneratorService.reportSubjects.resolves(taskLineages);
 
@@ -374,7 +373,7 @@ describe('TasksComponent', () => {
           owner: 'b',
         },
       ];
-      extractLineageService.getUserLineageToRemove.resolves('CHW Bettys Area');
+      userContactService.getUserLineageToRemove.resolves('CHW Bettys Area');
       rulesEngineService.fetchTaskDocsForAllContacts.resolves(taskDocs);
       lineageModelGeneratorService.reportSubjects.resolves(taskLineages);
 
diff --git a/webapp/tests/karma/ts/modules/trainings/trainings-content.component.spec.ts b/webapp/tests/karma/ts/modules/trainings/trainings-content.component.spec.ts
new file mode 100644
index 00000000000..f49adeaa107
--- /dev/null
+++ b/webapp/tests/karma/ts/modules/trainings/trainings-content.component.spec.ts
@@ -0,0 +1,173 @@
+import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideMockStore } from '@ngrx/store/testing';
+import { ActivatedRoute, Router } from '@angular/router';
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { of, Subject } from 'rxjs';
+
+import { GlobalActions } from '@mm-actions/global';
+import { PerformanceService } from '@mm-services/performance.service';
+import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
+import { TrainingCardsFormComponent } from '@mm-components/training-cards-form/training-cards-form.component';
+import { XmlFormsService } from '@mm-services/xml-forms.service';
+import { FormService } from '@mm-services/form.service';
+import { GeolocationService } from '@mm-services/geolocation.service';
+import { EnketoComponent } from '@mm-components/enketo/enketo.component';
+import { Selectors } from '@mm-selectors/index';
+import { TrainingsContentComponent } from '@mm-modules/trainings/trainings-content.component';
+import { ModalService } from '@mm-services/modal.service';
+
+describe('TrainingsContentComponent', () => {
+  let fixture: ComponentFixture<TrainingsContentComponent>;
+  let component: TrainingsContentComponent;
+  let modalService;
+  let globalActions;
+  let performanceService;
+  let stopPerformanceTrackStub;
+  let routerMock;
+
+  beforeEach(() => {
+    modalService = { show: sinon.stub() };
+    routerMock = {
+      navigateByUrl: sinon.stub(),
+      navigate: sinon.stub(),
+    };
+    globalActions = {
+      clearTrainingCards: sinon.stub(GlobalActions.prototype, 'clearTrainingCards'),
+      setTrainingCard: sinon.stub(GlobalActions.prototype, 'setTrainingCard'),
+      clearNavigation: sinon.stub(GlobalActions.prototype, 'clearNavigation'),
+    };
+    stopPerformanceTrackStub = sinon.stub();
+    performanceService = { track: sinon.stub().returns({ stop: stopPerformanceTrackStub }) };
+    const mockedSelectors = [
+      { selector: Selectors.getTrainingCardFormId, value: null },
+    ];
+
+    return TestBed
+      .configureTestingModule({
+        imports: [
+          TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
+        ],
+        declarations: [
+          TrainingsContentComponent,
+          ModalLayoutComponent,
+          TrainingCardsFormComponent,
+          EnketoComponent,
+        ],
+        providers: [
+          provideMockStore({ selectors: mockedSelectors }),
+          { provide: ActivatedRoute, useValue: { params: new Subject() } },
+          { provide: PerformanceService, useValue: performanceService },
+          { provide: ModalService, useValue: modalService },
+          { provide: Router, useValue: routerMock },
+          { provide: XmlFormsService, useValue: {} },
+          { provide: FormService, useValue: { unload: sinon.stub() } },
+          { provide: GeolocationService, useValue: {} },
+        ],
+      })
+      .compileComponents()
+      .then(() => {
+        fixture = TestBed.createComponent(TrainingsContentComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+        sinon.resetHistory();
+      });
+  });
+
+  afterEach(() => sinon.restore());
+
+  it('should unsubscribe from store and clear training cards state', () => {
+    const unsubscribeStub = sinon.stub(component.subscriptions, 'unsubscribe');
+
+    component.ngOnDestroy();
+
+    expect(unsubscribeStub.calledOnce).to.be.true;
+    expect(globalActions.clearNavigation.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
+  });
+
+  it('should close confirmation modal when not quitting the training', () => {
+    const modalRefMock = { close: sinon.stub(), afterClosed: sinon.stub().returns(of(null)) };
+    modalService.show.returns(modalRefMock);
+    component.quit();
+
+    component.continueTraining();
+
+    expect(modalRefMock.close.calledOnce).to.be.true;
+  });
+
+  it('should exit training and navigate to nextUrl if present', () => {
+    const modalRefMock = { close: sinon.stub(), afterClosed: sinon.stub().returns(of(null)) };
+    modalService.show.returns(modalRefMock);
+    component.quit();
+
+    component.exitTraining('/next/url');
+
+    expect(stopPerformanceTrackStub.calledOnce).to.be.true;
+    expect(modalRefMock.close.calledOnce).to.be.true;
+    expect(globalActions.clearNavigation.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
+    expect(routerMock.navigateByUrl.calledOnceWith('/next/url')).to.be.true;
+  });
+
+  it('should exit training and navigate to default path', () => {
+    const modalRefMock = { close: sinon.stub(), afterClosed: sinon.stub().returns(of(null)) };
+    modalService.show.returns(modalRefMock);
+    component.quit();
+
+    component.exitTraining('');
+
+    expect(stopPerformanceTrackStub.calledOnce).to.be.true;
+    expect(modalRefMock.close.calledOnce).to.be.true;
+    expect(globalActions.clearNavigation.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
+    expect(routerMock.navigateByUrl.notCalled).to.be.true;
+    expect(routerMock.navigate.calledOnceWith([ '/', 'trainings' ])).to.be.true;
+  });
+
+  it('should not show confirm modal if there are errors', () => {
+    component.hasError = true;
+
+    component.quit();
+
+    expect(routerMock.navigate.calledOnceWith([ '/', 'trainings' ])).to.be.true;
+    expect(globalActions.clearNavigation.calledOnce).to.be.true;
+    expect(globalActions.clearTrainingCards.calledOnce).to.be.true;
+    expect(component.showConfirmExit).to.be.false;
+    expect(modalService.show.notCalled).to.be.true;
+  });
+
+  it('should show confirm modal if there are not errors', () => {
+    component.hasError = false;
+
+    component.quit();
+
+    expect(routerMock.navigate.notCalled).to.be.true;
+    expect(globalActions.clearNavigation.notCalled).to.be.true;
+    expect(globalActions.clearTrainingCards.notCalled).to.be.true;
+    expect(component.showConfirmExit).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+  });
+
+  it('should not deactivate navigation when it cannot exit', () => {
+    const result = component.canDeactivate('/next/url');
+
+    expect(result).to.be.false;
+    expect(globalActions.setTrainingCard.calledOnceWith({ nextUrl: '/next/url' })).to.be.true;
+    expect(component.showConfirmExit).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+  });
+
+  it('should deactivate navigation when it cannot exit', () => {
+    component.close();
+
+    const result = component.canDeactivate('/next/url');
+
+    expect(result).to.be.true;
+    expect(globalActions.setTrainingCard.notCalled).to.be.true;
+    expect(component.showConfirmExit).to.be.false;
+    expect(modalService.show.notCalled).to.be.true;
+  });
+});
+
diff --git a/webapp/tests/karma/ts/modules/trainings/trainings.component.spec.ts b/webapp/tests/karma/ts/modules/trainings/trainings.component.spec.ts
new file mode 100644
index 00000000000..346194e488a
--- /dev/null
+++ b/webapp/tests/karma/ts/modules/trainings/trainings.component.spec.ts
@@ -0,0 +1,200 @@
+import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { ComponentFixture, fakeAsync, flush, TestBed } from '@angular/core/testing';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { MatIconModule } from '@angular/material/icon';
+import { RouterModule } from '@angular/router';
+import { expect } from 'chai';
+import sinon from 'sinon';
+
+import { GlobalActions } from '@mm-actions/global';
+import { PerformanceService } from '@mm-services/performance.service';
+import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
+import { TrainingCardsFormComponent } from '@mm-components/training-cards-form/training-cards-form.component';
+import { EnketoComponent } from '@mm-components/enketo/enketo.component';
+import { Selectors } from '@mm-selectors/index';
+import { TrainingsComponent } from '@mm-modules/trainings/trainings.component';
+import { TrainingCardsService } from '@mm-services/training-cards.service';
+import { ScrollLoaderProvider } from '@mm-providers/scroll-loader.provider';
+import { ToolBarComponent } from '@mm-components/tool-bar/tool-bar.component';
+
+describe('TrainingsComponent', () => {
+  let fixture: ComponentFixture<TrainingsComponent>;
+  let component: TrainingsComponent;
+  let globalActions;
+  let performanceService;
+  let stopPerformanceTrackStub;
+  let trainingCardsService;
+  let scrollLoaderProvider;
+  let consoleErrorMock;
+  let store;
+
+  beforeEach(() => {
+    consoleErrorMock = sinon.stub(console, 'error');
+    globalActions = {
+      unsetSelected: sinon.stub(GlobalActions.prototype, 'unsetSelected'),
+    };
+    stopPerformanceTrackStub = sinon.stub();
+    performanceService = { track: sinon.stub().returns({ stop: stopPerformanceTrackStub }) };
+    trainingCardsService = { getNextTrainings: sinon.stub() };
+    scrollLoaderProvider = { init: sinon.stub() };
+    const mockedSelectors = [
+      { selector: Selectors.getTrainingMaterials, value: null },
+      { selector: Selectors.getTrainingCardFormId, value: null },
+    ];
+
+    return TestBed
+      .configureTestingModule({
+        imports: [
+          RouterModule,
+          MatIconModule,
+          TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
+        ],
+        declarations: [
+          TrainingsComponent,
+          ModalLayoutComponent,
+          TrainingCardsFormComponent,
+          EnketoComponent,
+          ToolBarComponent,
+        ],
+        providers: [
+          provideMockStore({ selectors: mockedSelectors }),
+          { provide: PerformanceService, useValue: performanceService },
+          { provide: TrainingCardsService, useValue: trainingCardsService },
+          { provide: ScrollLoaderProvider, useValue: scrollLoaderProvider },
+        ],
+      })
+      .overrideComponent(ToolBarComponent, {
+        set: {
+          selector: 'mm-tool-bar',
+          template: '<div>Tool bar mock</div>'
+        }
+      })
+      .compileComponents()
+      .then(() => {
+        fixture = TestBed.createComponent(TrainingsComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+        sinon.resetHistory();
+        store = TestBed.inject(MockStore);
+      });
+  });
+
+  afterEach(() => {
+    store.resetSelectors();
+    sinon.restore();
+  });
+
+  it('should unsubscribe from store and clear selected from global state', () => {
+    const unsubscribeStub = sinon.stub(component.subscriptions, 'unsubscribe');
+
+    component.ngOnDestroy();
+
+    expect(unsubscribeStub.calledOnce).to.be.true;
+    expect(globalActions.unsetSelected.calledOnce).to.be.true;
+  });
+
+  it('should not get trainings when no forms', fakeAsync(async () => {
+    store.overrideSelector(Selectors.getTrainingMaterials, []);
+    store.refreshState();
+    flush();
+
+    expect(trainingCardsService.getNextTrainings.notCalled).to.be.true;
+  }));
+
+  it('should load trainings when there are forms', fakeAsync(async () => {
+    trainingCardsService.getNextTrainings.returns([ { code: 'form-1' } ]);
+    store.overrideSelector(Selectors.getTrainingMaterials, [ { _id: 'form-1' }, { _id: 'form-2' } ]);
+    store.refreshState();
+    flush();
+
+    expect(trainingCardsService.getNextTrainings.calledOnce).to.be.true;
+    expect(trainingCardsService.getNextTrainings.args[0]).to.have.deep.members([
+      [ { _id: 'form-1' }, { _id: 'form-2' } ],
+      50,
+      0,
+    ]);
+    expect(component.moreTrainings).to.be.false;
+    expect(component.loading).to.be.false;
+    expect(component.trainingList).to.have.deep.members([ { code: 'form-1' } ]);
+    expect(stopPerformanceTrackStub.calledOnce).to.be.true;
+    expect(scrollLoaderProvider.init.calledOnce).to.be.true;
+    expect(consoleErrorMock.notCalled).to.be.true;
+  }));
+
+  it('should load next page of trainings', fakeAsync(async () => {
+    store.overrideSelector(Selectors.getTrainingMaterials, [ { _id: 'form-3' }, { _id: 'form-4' } ]);
+    store.refreshState();
+    flush();
+    sinon.resetHistory();
+    const previousPage = Array
+      .from({ length: 50 })
+      .map((form, index) => ({
+        code: 'form-x-' + index,
+        id: 'form-id',
+        title: 'training-x',
+        startDate: new Date(),
+        duration: 1,
+        userRoles: [ 'chw' ],
+        isCompletedTraining: true,
+      }));
+    const nextPage = Array
+      .from({ length: 50 })
+      .map((form, index) => ({
+        code: 'form-y-' + index,
+        id: 'form-id',
+        title: 'training-y',
+        startDate: new Date(),
+        duration: 1,
+        userRoles: [ 'chw' ],
+        isCompletedTraining: true,
+      }));
+    component.trainingList = [...previousPage];
+    trainingCardsService.getNextTrainings.returns(nextPage);
+
+    await component.getTrainings();
+
+    expect(trainingCardsService.getNextTrainings.calledOnce).to.be.true;
+    expect(trainingCardsService.getNextTrainings.args[0]).to.have.deep.members([
+      [ { _id: 'form-3' }, { _id: 'form-4' } ],
+      50,
+      50,
+    ]);
+    expect(component.moreTrainings).to.be.true;
+    expect(component.loading).to.be.false;
+    expect(component.trainingList).to.have.deep.members([ ...previousPage, ...nextPage ]);
+    expect(scrollLoaderProvider.init.calledOnce).to.be.true;
+    expect(consoleErrorMock.notCalled).to.be.true;
+  }));
+
+  it('should catch error when loading a page of trainings', fakeAsync(async () => {
+    store.overrideSelector(Selectors.getTrainingMaterials, [ { _id: 'form-3' } ]);
+    store.refreshState();
+    flush();
+    sinon.resetHistory();
+    component.trainingList = [{
+      code: 'form-x',
+      id: 'form-id',
+      title: 'training-x',
+      startDate: new Date(),
+      duration: 1,
+      userRoles: [ 'chw' ],
+      isCompletedTraining: true,
+    }];
+    trainingCardsService.getNextTrainings.throws(new Error('Ups an error'));
+
+    await component.getTrainings();
+
+    expect(trainingCardsService.getNextTrainings.calledOnce).to.be.true;
+    expect(trainingCardsService.getNextTrainings.args[0]).to.have.deep.members([
+      [ { _id: 'form-3' } ],
+      50,
+      1,
+    ]);
+    expect(component.loading).to.be.false;
+    expect(stopPerformanceTrackStub.notCalled).to.be.true;
+    expect(scrollLoaderProvider.init.notCalled).to.be.true;
+    expect(consoleErrorMock.calledOnce).to.be.true;
+    expect(consoleErrorMock.args[0][0]).to.equal('Error getting training materials.');
+  }));
+});
+
diff --git a/webapp/tests/karma/ts/reducers/tasks.spec.ts b/webapp/tests/karma/ts/reducers/tasks.spec.ts
index 97403ef4997..acfc397952f 100644
--- a/webapp/tests/karma/ts/reducers/tasks.spec.ts
+++ b/webapp/tests/karma/ts/reducers/tasks.spec.ts
@@ -277,6 +277,7 @@ describe('Tasks reducer', () => {
         tasksList: [
           { _id: 'task1', dueDate: 22, state: 'Ready' },
           { _id: 'task2', dueDate: 33, state: 'Ready' },
+          { _id: 'task_id2', due: '33', field: 2 }
         ],
         loaded: true,
         taskGroup: {
diff --git a/webapp/tests/karma/ts/selectors/index.spec.ts b/webapp/tests/karma/ts/selectors/index.spec.ts
index ef29ab4fd92..579d7425eda 100644
--- a/webapp/tests/karma/ts/selectors/index.spec.ts
+++ b/webapp/tests/karma/ts/selectors/index.spec.ts
@@ -15,6 +15,7 @@ const globalState: GlobalState = {
   showContent: true,
   selectMode: false,
   forms: [ { _id: 'these' } ],
+  trainingMaterials: [ { _id: 'these' } ],
   filters: { some: 'filters' },
   sidebarFilter: {
     isOpen: false,
diff --git a/webapp/tests/karma/ts/services/extract-lineage.service.spec.ts b/webapp/tests/karma/ts/services/extract-lineage.service.spec.ts
index 8bfbf1b8324..c9907fc482d 100644
--- a/webapp/tests/karma/ts/services/extract-lineage.service.spec.ts
+++ b/webapp/tests/karma/ts/services/extract-lineage.service.spec.ts
@@ -3,28 +3,11 @@ import { expect } from 'chai';
 import sinon from 'sinon';
 
 import { ExtractLineageService } from '@mm-services/extract-lineage.service';
-import { UserSettingsService } from '@mm-services/user-settings.service';
-import { UserContactService } from '@mm-services/user-contact.service';
-import { AuthService } from '@mm-services/auth.service';
 
 describe('ExtractLineageService', () => {
   let service: ExtractLineageService;
-  let userSettingsService;
-  let userContactService;
-  let authService;
 
   beforeEach(() => {
-    userSettingsService = { get: sinon.stub() };
-    userContactService = { get: sinon.stub() };
-    authService = { online: sinon.stub() };
-
-    TestBed.configureTestingModule({
-      providers: [
-        { provide: UserContactService, useValue: userContactService },
-        { provide: UserSettingsService, useValue: userSettingsService },
-        { provide: AuthService, useValue: authService },
-      ]
-    });
     service = TestBed.inject(ExtractLineageService);
   });
 
@@ -81,52 +64,6 @@ describe('ExtractLineageService', () => {
     });
   });
 
-  describe('getUserLineageToRemove()', () => {
-    it('should return null when user is type online', async () => {
-      authService.online.returns(true);
-
-      const result = await service.getUserLineageToRemove();
-
-      expect(result).to.be.null;
-    });
-
-    it('should return null when user has more than one assigned facility', async () => {
-      authService.online.returns(false);
-      userSettingsService.get.resolves({ facility_id: [ 'id-1', 'id-2' ] });
-
-      const result = await service.getUserLineageToRemove();
-
-      expect(result).to.be.null;
-    });
-
-    it('should return null when parent is not defined', async () => {
-      authService.online.returns(false);
-      userSettingsService.get.resolves({ facility_id: [ 'id-1', 'id-2' ] });
-      userContactService.get.resolves({ parent: undefined });
-
-      const result = await service.getUserLineageToRemove();
-
-      expect(result).to.be.null;
-    });
-
-    it('should return facility name when user is type offline and has only one assigned facility', async () => {
-      authService.online.returns(false);
-      userSettingsService.get.resolves({ facility_id: 'id-1' });
-      userContactService.get.resolves({ parent: { name: 'Kisumu Area' } });
-
-      const resultWithString = await service.getUserLineageToRemove();
-
-      expect(resultWithString).to.equal('Kisumu Area');
-
-      userSettingsService.get.resolves({ facility_id: [ 'id-5' ] });
-      userContactService.get.resolves({ parent: { name: 'Kakamega Area' } });
-
-      const resultWithArray = await service.getUserLineageToRemove();
-
-      expect(resultWithArray).to.equal('Kakamega Area');
-    });
-  });
-
   describe('removeUserFacility()', () => {
     it('should return undefined when lineage is empty or undefined', () => {
       const resultWithUndefined = service.removeUserFacility(undefined as any, 'Kakamega Area');
diff --git a/webapp/tests/karma/ts/services/rules-engine.service.spec.ts b/webapp/tests/karma/ts/services/rules-engine.service.spec.ts
index 22254e0d65b..c727f37057f 100644
--- a/webapp/tests/karma/ts/services/rules-engine.service.spec.ts
+++ b/webapp/tests/karma/ts/services/rules-engine.service.spec.ts
@@ -469,11 +469,15 @@ describe('RulesEngineService', () => {
 
       const change = changesService.subscribe.args[0][0];
       await change.callback(changeFeedFormat({ type: 'data_record', form: 'f', fields: { patient_id: 'p1' } }));
+      expect(callback.callCount).to.equal(1);
       await change.callback(changeFeedFormat({ _id: '2', type: 'person', patient_id: 'p2' }));
+      expect(callback.callCount).to.equal(2);
       tick(500);
       await change.callback(changeFeedFormat({ _id: '3', type: 'person', patient_id: 'p3' }));
+      expect(callback.callCount).to.equal(3);
       tick(900);
       await change.callback(changeFeedFormat({ type: 'data_record', form: 'f', fields: { patient_id: 'p3' }}));
+      expect(callback.callCount).to.equal(4);
 
       expect(rulesEngineCoreStubs.updateEmissionsFor.callCount).to.equal(0);
 
@@ -481,7 +485,7 @@ describe('RulesEngineService', () => {
 
       expect(rulesEngineCoreStubs.updateEmissionsFor.callCount).to.equal(1);
       expect(rulesEngineCoreStubs.updateEmissionsFor.args[0][0]).to.have.members([ 'p3', '3', '2', 'p1' ]);
-      expect(callback.callCount).to.equal(1);
+      expect(callback.callCount).to.equal(4);
       subscription.unsubscribe();
 
       expect(telemetryService.record.calledOnce).to.be.true;
diff --git a/webapp/tests/karma/ts/services/training-cards.service.spec.ts b/webapp/tests/karma/ts/services/training-cards.service.spec.ts
index 18ae37fdc5c..c2c00a72e82 100644
--- a/webapp/tests/karma/ts/services/training-cards.service.spec.ts
+++ b/webapp/tests/karma/ts/services/training-cards.service.spec.ts
@@ -10,7 +10,8 @@ import { ModalService } from '@mm-services/modal.service';
 import { TrainingCardsService } from '@mm-services/training-cards.service';
 import { SessionService } from '@mm-services/session.service';
 import { RouteSnapshotService } from '@mm-services/route-snapshot.service';
-import { FeedbackService } from '@mm-services/feedback.service';
+import { TranslateService } from '@ngx-translate/core';
+import { TranslateFromService } from '@mm-services/translate-from.service';
 import { getProperty } from '../../../../src/ts/libs/schema';
 
 describe('TrainingCardsService', () => {
@@ -21,24 +22,22 @@ describe('TrainingCardsService', () => {
   let modalService;
   let localDb;
   let clock;
-  let consoleErrorMock;
+  let consoleErrorSpy;
   let sessionService;
   let routeSnapshotService;
-  let feedbackService;
 
   beforeEach(() => {
-    localDb = { allDocs: sinon.stub() };
+    localDb = { allDocs: sinon.stub().resolves({}) };
     dbService = { get: () => localDb };
     globalActions = { setTrainingCard: sinon.stub(GlobalActions.prototype, 'setTrainingCard') };
     xmlFormsService = { subscribe: sinon.stub() };
     modalService = { show: sinon.stub() };
     sessionService = {
-      userCtx: sinon.stub(),
+      userCtx: sinon.stub().returns({}),
       hasRole: sinon.spy(SessionService.prototype, 'hasRole'),
     };
-    feedbackService = { submit: sinon.stub() };
-    consoleErrorMock = sinon.stub(console, 'error');
-    routeSnapshotService = { get: sinon.stub() };
+    consoleErrorSpy = sinon.spy(console, 'error');
+    routeSnapshotService = { get: sinon.stub().returns({}) };
 
     TestBed.configureTestingModule({
       providers: [
@@ -48,22 +47,23 @@ describe('TrainingCardsService', () => {
         { provide: ModalService, useValue: modalService },
         { provide: SessionService, useValue: sessionService },
         { provide: RouteSnapshotService, useValue: routeSnapshotService },
-        { provide: FeedbackService, useValue: feedbackService },
-      ]
+        { provide: TranslateService, useValue: { instant: sinon.stub() } },
+        { provide: TranslateFromService, useValue: { get: sinon.stub().returnsArg(0) } },
+      ],
     });
 
     service = TestBed.inject(TrainingCardsService);
   });
 
   afterEach(() => {
-    clock && clock.restore();
+    clock?.restore();
     sinon.restore();
     document
       .querySelectorAll('#enketo-test')
       .forEach(element => element.remove());
   });
 
-  it('should set uncompleted training form when none are completed', async () => {
+  it('should show uncompleted training when none are completed', async () => {
     sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
     localDb.allDocs.resolves({ rows: [] });
     clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
@@ -105,16 +105,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
-
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
 
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.callCount).to.equal(4);
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -122,13 +116,12 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-b' } ]);
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
-  it('should set uncompleted training form when there are some completed', async () => {
+  it('should show uncompleted training when there are some completed', async () => {
     sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
     localDb.allDocs.resolves({ rows: [
       { doc: { form: 'training:form-a' } },
@@ -173,16 +166,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
-
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
 
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.callCount).to.equal(4);
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -190,11 +177,10 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-d' } ]);
-    expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should show uncompleted training form when they dont have duration set', async () => {
@@ -230,16 +216,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
-
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.calledThrice).to.be.true;
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -247,11 +227,10 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-c' } ]);
-    expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should show uncompleted training form when they dont have start_date set', async () => {
@@ -295,16 +274,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
-
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.callCount).to.equal(4);
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -312,11 +285,30 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-c' } ]);
+    expect(modalService.show.calledOnce).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
+  });
+
+  it('should not show training when privacy policy has not been accepted yet', async () => {
+    sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
+    localDb.allDocs.resolves({ rows: []});
+    clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
+    const xforms = [{
+      _id: 'form:training:abc-100',
+      internalId: 'training:form-c',
+      context: { duration: 9, user_roles: [ 'chw' ] },
+    }];
+
+    await service.displayTrainingCards(xforms, true, false);
+
+    expect(sessionService.userCtx.notCalled).to.be.true;
+    expect(sessionService.hasRole.notCalled).to.be.true;
+    expect(localDb.allDocs.notCalled).to.be.true;
+    expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should not show training form when all trainings are completed', async () => {
@@ -356,16 +348,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
-
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
 
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.calledThrice).to.be.true;
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -375,8 +361,7 @@ describe('TrainingCardsService', () => {
     });
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should not show training forms when all trainings have expired', async () => {
@@ -414,21 +399,14 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
-
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
 
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
     expect(sessionService.hasRole.calledThrice).to.be.true;
     expect(localDb.allDocs.notCalled).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should not show training forms when all trainings start in the future', async () => {
@@ -464,21 +442,14 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
-
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
     expect(sessionService.hasRole.calledThrice).to.be.true;
     expect(localDb.allDocs.notCalled).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should not show training forms if their internalID does not have the right prefix', async () => {
@@ -514,25 +485,19 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
-
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
     expect(localDb.allDocs.notCalled).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
 
-    expect(consoleErrorMock.calledThrice).to.be.true;
-    expect(consoleErrorMock.args[0][0].message)
+    expect(consoleErrorSpy.calledThrice).to.be.true;
+    expect(consoleErrorSpy.args[0][0].message)
       .to.equal('Training Cards :: Incorrect internalId format. Doc ID: form:training:cards-1');
-    expect(consoleErrorMock.args[1][0].message)
+    expect(consoleErrorSpy.args[1][0].message)
       .to.equal('Training Cards :: Incorrect internalId format. Doc ID: form:training:cards-2');
-    expect(consoleErrorMock.args[2][0].message)
+    expect(consoleErrorSpy.args[2][0].message)
       .to.equal('Training Cards :: Incorrect internalId format. Doc ID: form:training:cards-3');
   });
 
@@ -540,21 +505,14 @@ describe('TrainingCardsService', () => {
     sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
     localDb.allDocs.resolves({ rows: [] });
     clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
-    service.initTrainingCards();
-
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
 
-    await callback(null, []);
+    await service.displayTrainingCards([], true, true);
 
     expect(sessionService.hasRole.notCalled).to.be.true;
     expect(localDb.allDocs.notCalled).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should log error from xmlFormsService', async () => {
@@ -567,14 +525,10 @@ describe('TrainingCardsService', () => {
 
     await callback(new Error('some error'), []);
 
-    expect(localDb.allDocs.notCalled).to.be.true;
-    expect(sessionService.userCtx.notCalled).to.be.true;
-    expect(sessionService.hasRole.notCalled).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
-    expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.calledOnce).to.be.true;
-    expect(consoleErrorMock.args[0][0]).to.equal('Training Cards :: Error fetching forms.');
-    expect(consoleErrorMock.args[0][1].message).to.equal('some error');
+    expect(consoleErrorSpy.calledOnce).to.be.true;
+    expect(consoleErrorSpy.args[0][0]).to.equal('Training Cards :: Error fetching forms.');
+    expect(consoleErrorSpy.args[0][1].message).to.equal('some error');
   });
 
   it('should catch exception', async () => {
@@ -590,34 +544,37 @@ describe('TrainingCardsService', () => {
         user_roles: [ 'chw' ],
       },
     }];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
-
-    await callback(null, xforms);
+    await service.displayTrainingCards(xforms, true, true);
 
     expect(sessionService.hasRole.calledOnce).to.be.true;
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.notCalled).to.be.true;
     expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.calledOnce).to.be.true;
-    expect(consoleErrorMock.args[0][0]).to.equal('Training Cards :: Error showing modal.');
-    expect(consoleErrorMock.args[0][1].message).to.equal('some error');
+    expect(consoleErrorSpy.calledOnce).to.be.true;
+    expect(consoleErrorSpy.args[0][0]).to.equal('Training Cards :: Error showing modal.');
+    expect(consoleErrorSpy.args[0][1].message).to.equal('some error');
   });
 
-  it('should not display training if route has hideTraining flag', async () => {
+  it('should display training if route has hideTraining false', async () => {
+    sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
+    localDb.allDocs.resolves({ rows: [ { doc: { form: 'training:form-b' } } ] });
+    clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
+    const xforms = [ {
+      _id: 'form:training:abc-100',
+      internalId: 'training:form-c',
+      context: { duration: 9, user_roles: [ 'chw' ] },
+    }];
+
     routeSnapshotService.get.returns({ data: { hideTraining: true } });
-    service.displayTrainingCards();
+    await service.displayTrainingCards(xforms, true, true);
+
     expect(modalService.show.notCalled).to.be.true;
-  });
 
-  it('should display training', () => {
     routeSnapshotService.get.returns({ data: { hideTraining: false } });
-    service.displayTrainingCards();
+    await service.displayTrainingCards(xforms, true, true);
+
     expect(modalService.show.calledOnce).to.be.true;
   });
 
@@ -673,16 +630,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
+    await service.displayTrainingCards(xforms, true, true);
 
-    await callback(null, xforms);
-
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.callCount).to.equal(5);
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -690,11 +641,10 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-e' } ]);
-    expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should show uncompleted training when form does not have user_roles defined', async () => {
@@ -722,16 +672,10 @@ describe('TrainingCardsService', () => {
         },
       },
     ];
-    service.initTrainingCards();
 
-    expect(xmlFormsService.subscribe.calledOnce).to.be.true;
-    expect(xmlFormsService.subscribe.args[0][0]).to.equal('TrainingCards');
-    expect(xmlFormsService.subscribe.args[0][1]).to.deep.equal({ trainingCards: true });
-    const callback = xmlFormsService.subscribe.args[0][2];
+    await service.displayTrainingCards(xforms, true, true);
 
-    await callback(null, xforms);
-
-    expect(sessionService.userCtx.calledOnce).to.be.true;
+    expect(sessionService.userCtx.calledTwice).to.be.true;
     expect(sessionService.hasRole.calledOnce).to.be.true;
     expect(localDb.allDocs.calledOnce).to.be.true;
     expect(localDb.allDocs.args[0][0]).to.deep.equal({
@@ -739,11 +683,10 @@ describe('TrainingCardsService', () => {
       startkey: 'training:a_user:',
       endkey: 'training:a_user:\ufff0',
     });
-    expect(globalActions.setTrainingCard.calledOnce);
+    expect(globalActions.setTrainingCard.calledOnce).to.be.true;
     expect(globalActions.setTrainingCard.args[0]).to.deep.equal([ { formId: 'training:form-d' } ]);
-    expect(modalService.show.notCalled).to.be.true;
-    expect(consoleErrorMock.notCalled).to.be.true;
-    expect(feedbackService.submit.notCalled).to.be.true;
+    expect(modalService.show.calledOnce).to.be.true;
+    expect(consoleErrorSpy.notCalled).to.be.true;
   });
 
   it('should evaluate if the internalID is from a training card', () => {
@@ -778,46 +721,207 @@ describe('TrainingCardsService', () => {
 
     it('should display training when it has not been displayed today', async () => {
       routeSnapshotService.get.returns({ data: { hideTraining: false } });
-      sessionService.userCtx.returns({ name: 'ronald' });
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'ronald' });
       window.localStorage.setItem('training-cards-last-viewed-date-ronald', '2024-05-23 20:29:25');
       clock = sinon.useFakeTimers(new Date('2025-05-25 20:29:25'));
+      localDb.allDocs.resolves({ rows: [] });
+      const xforms = [ {
+        _id: 'form:training:abc-100',
+        internalId: 'training:form-c',
+        context: { duration: 9, user_roles: [ 'chw' ] },
+      }];
 
-      service.displayTrainingCards();
+      await service.displayTrainingCards(xforms, true, true);
 
       expect(modalService.show.calledOnce).to.be.true;
     });
 
     it('should display training when last viewed date is empty', async () => {
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'ronald' });
       routeSnapshotService.get.returns({ data: { hideTraining: false } });
       window.localStorage.setItem('training-cards-last-viewed-date-ronald', '');
       clock = sinon.useFakeTimers(new Date('2025-05-25 20:29:25'));
+      localDb.allDocs.resolves({ rows: [] });
+      const xforms = [ {
+        _id: 'form:training:abc-100',
+        internalId: 'training:form-c',
+        context: { duration: 9, user_roles: [ 'chw' ] },
+      }];
 
-      service.displayTrainingCards();
+      await service.displayTrainingCards(xforms, true, true);
 
       expect(modalService.show.calledOnce).to.be.true;
     });
 
     it('should not display training when it has been displayed today for the same user', async () => {
       routeSnapshotService.get.returns({ data: { hideTraining: false } });
-      sessionService.userCtx.returns({ name: 'ronald' });
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'ronald' });
       window.localStorage.setItem('training-cards-last-viewed-date-ronald', '2024-05-23 20:29:25');
       clock = sinon.useFakeTimers(new Date('2024-05-23 06:29:25'));
+      localDb.allDocs.resolves({ rows: [] });
+      const xforms = [ {
+        _id: 'form:training:abc-100',
+        internalId: 'training:form-c',
+        context: { duration: 9, user_roles: [ 'chw' ] },
+      }];
 
-      service.displayTrainingCards();
+      await service.displayTrainingCards(xforms, true, true);
 
       expect(modalService.show.notCalled).to.be.true;
     });
 
     it('should display training when it has not been displayed for a different user', async () => {
       routeSnapshotService.get.returns({ data: { hideTraining: false } });
-      sessionService.userCtx.returns({ name: 'sarah' });
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'sarah' });
       window.localStorage.setItem('training-cards-last-viewed-date-ronald', '2024-05-23 20:29:25');
       clock = sinon.useFakeTimers(new Date('2024-05-23 06:29:25'));
+      localDb.allDocs.resolves({ rows: [ { doc: { form: 'training:form-b' } } ] });
+      const xforms = [ {
+        _id: 'form:training:abc-100',
+        internalId: 'training:form-c',
+        context: { duration: 9, user_roles: [ 'chw' ] },
+      }];
 
-      service.displayTrainingCards();
+      await service.displayTrainingCards(xforms, true, true);
 
       expect(modalService.show.calledOnce).to.be.true;
     });
   });
 
+  describe('Get next available trainings', () => {
+    it('should return list of available trainings', async () => {
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
+      localDb.allDocs.resolves({ rows: [
+        { doc: { form: 'training:form-a' } },
+        { doc: { form: 'training:form-b' } },
+      ]});
+      clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
+      const xforms = [
+        {
+          _id: 'form:training:abc-789',
+          internalId: 'training:form-c',
+          context: { start_date: '2022-05-28', duration: 6, user_roles: [ 'chw' ] },
+        },
+        {
+          _id: 'form:training:abc-456',
+          internalId: 'training:form-a',
+          context: { start_date: '2022-05-18', duration: 2, user_roles: [ 'chw' ] },
+        },
+        {
+          _id: 'form:training:abc-123',
+          internalId: 'training:form-b',
+          context: { start_date: '2022-05-21', duration: 3, user_roles: [ 'chw' ] },
+        },
+        {
+          _id: 'form:training:abc-098',
+          internalId: 'training:form-d',
+          context: { start_date: '2022-05-21', duration: 9, user_roles: [ 'chw' ] },
+        },
+      ];
+
+      const result = await service.getNextTrainings(xforms, 50, 0);
+
+      expect(sessionService.userCtx.calledOnce).to.be.true;
+      expect(sessionService.hasRole.callCount).to.equal(4);
+      expect(localDb.allDocs.calledOnce).to.be.true;
+      expect(localDb.allDocs.args[0][0]).to.deep.equal({
+        include_docs: true,
+        startkey: 'training:a_user:',
+        endkey: 'training:a_user:\ufff0',
+      });
+      expect(result).excluding('startDate').to.have.deep.members([
+        {
+          id: 'form:training:abc-123',
+          code: 'training:form-b',
+          isCompletedTraining: true,
+          title: undefined,
+          userRoles: [ 'chw' ],
+          duration: 3,
+        },
+        {
+          id: 'form:training:abc-098',
+          code: 'training:form-d',
+          isCompletedTraining: false,
+          title: undefined,
+          userRoles: [ 'chw' ],
+          duration: 9,
+        },
+      ]);
+    });
+
+    it('should paginate the list of available trainings', async () => {
+      sessionService.userCtx.returns({ roles: [ 'chw' ], name: 'a_user' });
+      localDb.allDocs.resolves({ rows: [
+        { doc: { form: 'training:form-a' } },
+        { doc: { form: 'training:form-b' } },
+      ]});
+      clock = sinon.useFakeTimers(new Date('2022-05-23 20:29:25'));
+      const xforms = [
+        ...Array.from({ length: 30 }).map((item, index) => ({
+          _id: 'form:training:abc-123' + index,
+          internalId: 'training:form-b',
+          context: { start_date: '2022-05-21', duration: 3, user_roles: [ 'chw' ] },
+        })),
+        ...Array.from({ length: 30 }).map((item, index) => ({
+          _id: 'form:training:abc-789' + index,
+          internalId: 'training:form-c',
+          context: { start_date: '2022-05-28', duration: 6, user_roles: [ 'chw' ] },
+        })),
+        ...Array.from({ length: 30 }).map((item, index) => ({
+          _id: 'form:training:abc-098' + index,
+          title: 'A Title',
+          internalId: 'training:form-d',
+          context: { start_date: '2022-05-21', duration: 9, user_roles: [ 'chw' ] },
+        })),
+      ];
+
+      const expectedPage1 = [
+        ...Array.from({ length: 30 }).map((item, index) => ({
+          id: 'form:training:abc-123' + index,
+          code: 'training:form-b',
+          duration: 3,
+          title: undefined,
+          isCompletedTraining: true,
+          userRoles: [ 'chw' ],
+        })),
+        ...Array.from({ length: 20 }).map((item, index) => ({
+          id: 'form:training:abc-098' + index,
+          title: 'A Title',
+          code: 'training:form-d',
+          isCompletedTraining: false,
+          duration: 9,
+          userRoles: [ 'chw' ],
+        })),
+      ];
+
+      const expectedPage2 = [
+        ...Array.from({ length: 10 }).map((item, index) => ({
+          id: 'form:training:abc-098' + (20 + index),
+          title: 'A Title',
+          code: 'training:form-d',
+          isCompletedTraining: false,
+          duration: 9,
+          userRoles: [ 'chw' ],
+        })),
+      ];
+
+      const resultPage1 = await service.getNextTrainings(xforms, 50, 0);
+
+      expect(sessionService.userCtx.calledOnce).to.be.true;
+      expect(sessionService.hasRole.callCount).to.equal(90);
+      expect(localDb.allDocs.calledOnce).to.be.true;
+      expect(localDb.allDocs.args[0][0]).to.deep.equal({
+        include_docs: true,
+        startkey: 'training:a_user:',
+        endkey: 'training:a_user:\ufff0',
+      });
+      expect(resultPage1?.length).to.equal(50);
+      expect(resultPage1).excluding('startDate').to.have.deep.members(expectedPage1);
+
+      const resultPage2 = await service.getNextTrainings(xforms, 50, 50);
+
+      expect(resultPage2?.length).to.equal(10);
+      expect(resultPage2).excluding('startDate').to.have.deep.members(expectedPage2);
+    });
+  });
 });
diff --git a/webapp/tests/karma/ts/services/user-contact.service.spec.ts b/webapp/tests/karma/ts/services/user-contact.service.spec.ts
index 6c44a1bd305..3e757ce8ffb 100644
--- a/webapp/tests/karma/ts/services/user-contact.service.spec.ts
+++ b/webapp/tests/karma/ts/services/user-contact.service.spec.ts
@@ -6,9 +6,11 @@ import { Person, Qualifier } from '@medic/cht-datasource';
 import { UserContactService } from '@mm-services/user-contact.service';
 import { UserSettingsService } from '@mm-services/user-settings.service';
 import { CHTDatasourceService } from '@mm-services/cht-datasource.service';
+import { AuthService } from '@mm-services/auth.service';
 
 describe('UserContact service', () => {
   let service: UserContactService;
+  let authService;
   let getPerson;
   let getPersonWithLineage;
   let bind;
@@ -21,11 +23,13 @@ describe('UserContact service', () => {
     bind = sinon.stub();
     bind.withArgs(Person.v1.get).returns(getPerson);
     bind.withArgs(Person.v1.getWithLineage).returns(getPersonWithLineage);
+    authService = { online: sinon.stub() };
 
     TestBed.configureTestingModule({
       providers: [
         { provide: CHTDatasourceService, useValue: { bind } },
         { provide: UserSettingsService, useValue: { get: UserSettings } },
+        { provide: AuthService, useValue: authService },
       ],
     });
     service = TestBed.inject(UserContactService);
@@ -33,81 +37,146 @@ describe('UserContact service', () => {
 
   afterEach(() => {
     expect(bind.args).to.deep.equal([[Person.v1.get], [Person.v1.getWithLineage]]);
-    expect(UserSettings.callCount).to.equal(1);
     sinon.restore();
   });
 
-  it('returns error from user settings', async () => {
-    UserSettings.rejects(new Error('boom'));
+  describe('get', () => {
+    afterEach(() => {
+      expect(UserSettings.callCount).to.equal(1);
+      expect(authService.online.notCalled).to.be.true;
+    });
 
-    await expect(service.get()).to.be.rejectedWith('boom');
+    it('returns error from user settings', async () => {
+      UserSettings.rejects(new Error('boom'));
 
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.notCalled).to.be.true;
-  });
+      await expect(service.get()).to.be.rejectedWith('boom');
 
-  it('returns null when no configured contact', async () => {
-    UserSettings.resolves({});
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
 
-    const userContact = await service.get();
+    it('returns null when no configured contact', async () => {
+      UserSettings.resolves({});
 
-    expect(userContact).to.be.null;
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.notCalled).to.be.true;
-  });
+      const userContact = await service.get();
 
-  it('returns null when user settings not in the database', async () => {
-    UserSettings.rejects({ code: 404, reason: 'missing' });
+      expect(userContact).to.be.null;
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
 
-    const userContact = await service.get();
+    it('returns null when user settings not in the database', async () => {
+      UserSettings.rejects({ code: 404, reason: 'missing' });
 
-    expect(userContact).to.be.null;
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.notCalled).to.be.true;
-  });
+      const userContact = await service.get();
+
+      expect(userContact).to.be.null;
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
 
-  it('returns null when configured contact not in the database', async () => {
-    UserSettings.resolves({ contact_id: 'not-found' });
-    getPersonWithLineage.resolves(null);
+    it('returns null when configured contact not in the database', async () => {
+      UserSettings.resolves({ contact_id: 'not-found' });
+      getPersonWithLineage.resolves(null);
 
-    const userContact = await service.get();
+      const userContact = await service.get();
 
-    expect(userContact).to.be.null;
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid('not-found'))).to.be.true;
-  });
+      expect(userContact).to.be.null;
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid('not-found'))).to.be.true;
+    });
 
-  it('returns error from getting contact', async () => {
-    UserSettings.resolves({ contact_id: 'nobody' });
-    getPersonWithLineage.rejects(new Error('boom'));
+    it('returns error from getting contact', async () => {
+      UserSettings.resolves({ contact_id: 'nobody' });
+      getPersonWithLineage.rejects(new Error('boom'));
 
-    await expect(service.get()).to.be.rejectedWith('boom');
+      await expect(service.get()).to.be.rejectedWith('boom');
 
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid('nobody'))).to.be.true;
-  });
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid('nobody'))).to.be.true;
+    });
 
-  it('returns contact with lineage', async () => {
-    const expected = { _id: 'somebody', name: 'Some Body' };
-    UserSettings.resolves({ contact_id: 'somebody' });
-    getPersonWithLineage.resolves(expected);
+    it('returns contact with lineage', async () => {
+      const expected = { _id: 'somebody', name: 'Some Body' };
+      UserSettings.resolves({ contact_id: 'somebody' });
+      getPersonWithLineage.resolves(expected);
 
-    const actual = await service.get();
+      const actual = await service.get();
+
+      expect(actual).to.equal(expected);
+      expect(getPerson.notCalled).to.be.true;
+      expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid(expected._id))).to.be.true;
+    });
 
-    expect(actual).to.equal(expected);
-    expect(getPerson.notCalled).to.be.true;
-    expect(getPersonWithLineage.calledOnceWithExactly(Qualifier.byUuid(expected._id))).to.be.true;
+    it('returns contact without lineage', async () => {
+      const expected = { _id: 'somebody', name: 'Some Body' };
+      UserSettings.resolves({ contact_id: 'somebody' });
+      getPerson.resolves(expected);
+
+      const actual = await service.get({ hydrateLineage: false });
+
+      expect(actual).to.equal(expected);
+      expect(getPerson.calledOnceWithExactly(Qualifier.byUuid(expected._id))).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
   });
 
-  it('returns contact without lineage', async () => {
-    const expected = { _id: 'somebody', name: 'Some Body' };
-    UserSettings.resolves({ contact_id: 'somebody' });
-    getPerson.resolves(expected);
+  describe('getUserLineageToRemove()', () => {
+    afterEach(() => {
+      expect(getPerson.notCalled).to.be.true;
+      expect(authService.online.calledWithExactly(true)).to.be.true;
+    });
 
-    const actual = await service.get({ hydrateLineage: false });
+    it('should return null when user is type online', async () => {
+      authService.online.returns(true);
 
-    expect(actual).to.equal(expected);
-    expect(getPerson.calledOnceWithExactly(Qualifier.byUuid(expected._id))).to.be.true;
-    expect(getPersonWithLineage.notCalled).to.be.true;
+      const result = await service.getUserLineageToRemove();
+
+      expect(result).to.be.null;
+      expect(UserSettings.notCalled).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
+
+    it('should return null when user has more than one assigned facility', async () => {
+      authService.online.returns(false);
+      UserSettings.resolves({ contact_id: 'somebody', facility_id: [ 'id-1', 'id-2' ] });
+
+      const result = await service.getUserLineageToRemove();
+
+      expect(result).to.be.null;
+      expect(UserSettings.calledOnceWithExactly()).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
+
+    it('should return null when parent is not defined', async () => {
+      authService.online.returns(false);
+      UserSettings.resolves({ contact_id: 'somebody', facility_id: [ 'id-1', 'id-2' ] });
+      getPersonWithLineage.resolves({ parent: undefined });
+
+      const result = await service.getUserLineageToRemove();
+
+      expect(result).to.be.null;
+      expect(UserSettings.calledOnceWithExactly()).to.be.true;
+      expect(getPersonWithLineage.notCalled).to.be.true;
+    });
+
+    it('should return facility name when user is type offline and has only one assigned facility', async () => {
+      authService.online.returns(false);
+      UserSettings.resolves({ contact_id: 'somebody', facility_id: 'id-1' });
+      getPersonWithLineage.resolves({ parent: { name: 'Kisumu Area' } });
+
+      const resultWithString = await service.getUserLineageToRemove();
+
+      expect(resultWithString).to.equal('Kisumu Area');
+
+      UserSettings.resolves({ contact_id: 'somebody', facility_id: [ 'id-5' ] });
+      getPersonWithLineage.resolves({ parent: { name: 'Kakamega Area' } });
+
+      const resultWithArray = await service.getUserLineageToRemove();
+
+      expect(resultWithArray).to.equal('Kakamega Area');
+      expect(UserSettings.callCount).to.equal(4);
+      expect(getPersonWithLineage.args).to.deep.equal([[Qualifier.byUuid('somebody')], [Qualifier.byUuid('somebody')]]);
+    });
   });
 });