Tidy and fix travis tests