Fix test and travis config