Refactor/travistest