Fix spec
Fix compilation tests