Fix tests
More fix
Fix travis