OMS-732: Updates and tests.