FIX TravisCI and tests