Fix tests and travis