more test fixes for travis