Refactored travis tests