refactoring tests + travis