Fix build tests
Merge pull request #218 from CruGlobal/FIX-build-tests

Fix build tests