Fix tests
Travis support