Fix tests and hopefully fix travis.