FIX unit tests
FIX TravisCI