Improve travis tests