Update travis-ci tests for master