Refactor travis broken feature 3