SSP-2727 Fix unit test compilation errors