SEC-2377: Fix tests