Refactor travis broken feature 4