travis and test fixes