Fix tests and travis.