Fixed the tests and travis integration