Test/build optimization
One more Travis fix