DB-4709 tests updated