Tweak travis build and make test