SSP-2305 Fix test compilation errors