Fix tests & Travis