Fixind build in branch
fixed build
Merge pull request #1 from raphaelmor/fix-build

Fix Unit tests