SSP-2726 Fix unit test compilation errors