Fixed build issues, followup to Bug 1063318
Fixed unit tests compilation