Fixing unit tests for travis