Mostly improving Travis integration/tests