Fix all the tests!
Change travis config