SSP-47 Fix test compilation failures