SSP-3014 Fix unit test compilation errors