SEC-2468: Fix tests