NXP-11335: fix sql with soft-delete mode not activated
Fix tests that may block on failure