Updated tests
Updated travis config file