More test fixes for travis