Updated tests and travis config