SEC-2507: Fix test imports