Feature/fix unit tests

Updating Unit Tests to be able to build successfully  with Travis.

cc @koke @jleandroperez can you guys have a look on this.