Fix integration tests and travis