fix tests, improve travis ci