PJSM-210: Fix failing tests.