SSP-479, SSP-2216 Fix test compilation failures
SSP-2261,SSP-2274,SSP-2275 Fix test compilation failures